diff --git a/integ-test/src/test/java/org/opensearch/sql/calcite/big5/PPLBig5IT.java b/integ-test/src/test/java/org/opensearch/sql/calcite/big5/PPLBig5IT.java
index 4997d361203..2c2b91411c1 100644
--- a/integ-test/src/test/java/org/opensearch/sql/calcite/big5/PPLBig5IT.java
+++ b/integ-test/src/test/java/org/opensearch/sql/calcite/big5/PPLBig5IT.java
@@ -53,7 +53,7 @@ public static void reset() throws IOException {
   public void asc_sort_timestamp() throws IOException {
     String ppl = sanitize(loadExpectedQuery("asc_sort_timestamp.ppl"));
     timing(summary, "asc_sort_timestamp", ppl);
-    String expected = loadExpectedPlan("asc_sort_timestamp.yaml");
+    String expected = loadExpectedPlan("big5/asc_sort_timestamp.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -61,7 +61,7 @@ public void asc_sort_timestamp() throws IOException {
   public void asc_sort_timestamp_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("asc_sort_timestamp_can_match_shortcut.ppl"));
     timing(summary, "asc_sort_timestamp_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("asc_sort_timestamp_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/asc_sort_timestamp_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -69,7 +69,7 @@ public void asc_sort_timestamp_can_match_shortcut() throws IOException {
   public void asc_sort_timestamp_no_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("asc_sort_timestamp_no_can_match_shortcut.ppl"));
     timing(summary, "asc_sort_timestamp_no_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("asc_sort_timestamp_no_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/asc_sort_timestamp_no_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -77,7 +77,7 @@ public void asc_sort_timestamp_no_can_match_shortcut() throws IOException {
   public void asc_sort_with_after_timestamp() throws IOException {
     String ppl = sanitize(loadExpectedQuery("asc_sort_with_after_timestamp.ppl"));
     timing(summary, "asc_sort_with_after_timestamp", ppl);
-    String expected = loadExpectedPlan("asc_sort_with_after_timestamp.yaml");
+    String expected = loadExpectedPlan("big5/asc_sort_with_after_timestamp.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -85,7 +85,7 @@ public void asc_sort_with_after_timestamp() throws IOException {
   public void composite_date_histogram_daily() throws IOException {
     String ppl = sanitize(loadExpectedQuery("composite_date_histogram_daily.ppl"));
     timing(summary, "composite_date_histogram_daily", ppl);
-    String expected = loadExpectedPlan("composite_date_histogram_daily.yaml");
+    String expected = loadExpectedPlan("big5/composite_date_histogram_daily.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -93,7 +93,7 @@ public void composite_date_histogram_daily() throws IOException {
   public void composite_terms_keyword() throws IOException {
     String ppl = sanitize(loadExpectedQuery("composite_terms_keyword.ppl"));
     timing(summary, "composite_terms_keyword", ppl);
-    String expected = loadExpectedPlan("composite_terms_keyword.yaml");
+    String expected = loadExpectedPlan("big5/composite_terms_keyword.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -101,7 +101,7 @@ public void composite_terms_keyword() throws IOException {
   public void composite_terms() throws IOException {
     String ppl = sanitize(loadExpectedQuery("composite_terms.ppl"));
     timing(summary, "composite_terms", ppl);
-    String expected = loadExpectedPlan("composite_terms.yaml");
+    String expected = loadExpectedPlan("big5/composite_terms.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -109,7 +109,7 @@ public void composite_terms() throws IOException {
   public void date_histogram_hourly_agg() throws IOException {
     String ppl = sanitize(loadExpectedQuery("date_histogram_hourly_agg.ppl"));
     timing(summary, "date_histogram_hourly_agg", ppl);
-    String expected = loadExpectedPlan("date_histogram_hourly_agg.yaml");
+    String expected = loadExpectedPlan("big5/date_histogram_hourly_agg.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -117,7 +117,7 @@ public void date_histogram_hourly_agg() throws IOException {
   public void date_histogram_minute_agg() throws IOException {
     String ppl = sanitize(loadExpectedQuery("date_histogram_minute_agg.ppl"));
     timing(summary, "date_histogram_minute_agg", ppl);
-    String expected = loadExpectedPlan("date_histogram_minute_agg.yaml");
+    String expected = loadExpectedPlan("big5/date_histogram_minute_agg.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -125,7 +125,7 @@ public void date_histogram_minute_agg() throws IOException {
   public void test_default() throws IOException {
     String ppl = sanitize(loadExpectedQuery("default.ppl"));
     timing(summary, "default", ppl);
-    String expected = loadExpectedPlan("default.yaml");
+    String expected = loadExpectedPlan("big5/default.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -133,7 +133,7 @@ public void test_default() throws IOException {
   public void desc_sort_timestamp() throws IOException {
     String ppl = sanitize(loadExpectedQuery("desc_sort_timestamp.ppl"));
     timing(summary, "desc_sort_timestamp", ppl);
-    String expected = loadExpectedPlan("desc_sort_timestamp.yaml");
+    String expected = loadExpectedPlan("big5/desc_sort_timestamp.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -141,7 +141,7 @@ public void desc_sort_timestamp() throws IOException {
   public void desc_sort_timestamp_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("desc_sort_timestamp_can_match_shortcut.ppl"));
     timing(summary, "desc_sort_timestamp_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("desc_sort_timestamp_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/desc_sort_timestamp_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -149,7 +149,7 @@ public void desc_sort_timestamp_can_match_shortcut() throws IOException {
   public void desc_sort_timestamp_no_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("desc_sort_timestamp_no_can_match_shortcut.ppl"));
     timing(summary, "desc_sort_timestamp_no_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("desc_sort_timestamp_no_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/desc_sort_timestamp_no_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -157,7 +157,7 @@ public void desc_sort_timestamp_no_can_match_shortcut() throws IOException {
   public void desc_sort_with_after_timestamp() throws IOException {
     String ppl = sanitize(loadExpectedQuery("desc_sort_with_after_timestamp.ppl"));
     timing(summary, "desc_sort_with_after_timestamp", ppl);
-    String expected = loadExpectedPlan("desc_sort_with_after_timestamp.yaml");
+    String expected = loadExpectedPlan("big5/desc_sort_with_after_timestamp.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -165,7 +165,7 @@ public void desc_sort_with_after_timestamp() throws IOException {
   public void keyword_in_range() throws IOException {
     String ppl = sanitize(loadExpectedQuery("keyword_in_range.ppl"));
     timing(summary, "keyword_in_range", ppl);
-    String expected = loadExpectedPlan("keyword_in_range.yaml");
+    String expected = loadExpectedPlan("big5/keyword_in_range.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -173,7 +173,7 @@ public void keyword_in_range() throws IOException {
   public void keyword_terms() throws IOException {
     String ppl = sanitize(loadExpectedQuery("keyword_terms.ppl"));
     timing(summary, "keyword_terms", ppl);
-    String expected = loadExpectedPlan("keyword_terms.yaml");
+    String expected = loadExpectedPlan("big5/keyword_terms.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -181,7 +181,7 @@ public void keyword_terms() throws IOException {
   public void keyword_terms_low_cardinality() throws IOException {
     String ppl = sanitize(loadExpectedQuery("keyword_terms_low_cardinality.ppl"));
     timing(summary, "keyword_terms_low_cardinality", ppl);
-    String expected = loadExpectedPlan("keyword_terms_low_cardinality.yaml");
+    String expected = loadExpectedPlan("big5/keyword_terms_low_cardinality.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -189,7 +189,7 @@ public void keyword_terms_low_cardinality() throws IOException {
   public void multi_terms_keyword() throws IOException {
     String ppl = sanitize(loadExpectedQuery("multi_terms_keyword.ppl"));
     timing(summary, "multi_terms_keyword", ppl);
-    String expected = loadExpectedPlan("multi_terms_keyword.yaml");
+    String expected = loadExpectedPlan("big5/multi_terms_keyword.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -197,7 +197,7 @@ public void multi_terms_keyword() throws IOException {
   public void query_string_on_message() throws IOException {
     String ppl = sanitize(loadExpectedQuery("query_string_on_message.ppl"));
     timing(summary, "query_string_on_message", ppl);
-    String expected = loadExpectedPlan("query_string_on_message.yaml");
+    String expected = loadExpectedPlan("big5/query_string_on_message.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -205,7 +205,7 @@ public void query_string_on_message() throws IOException {
   public void query_string_on_message_filtered() throws IOException {
     String ppl = sanitize(loadExpectedQuery("query_string_on_message_filtered.ppl"));
     timing(summary, "query_string_on_message_filtered", ppl);
-    String expected = loadExpectedPlan("query_string_on_message_filtered.yaml");
+    String expected = loadExpectedPlan("big5/query_string_on_message_filtered.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -213,7 +213,7 @@ public void query_string_on_message_filtered() throws IOException {
   public void query_string_on_message_filtered_sorted_num() throws IOException {
     String ppl = sanitize(loadExpectedQuery("query_string_on_message_filtered_sorted_num.ppl"));
     timing(summary, "query_string_on_message_filtered_sorted_num", ppl);
-    String expected = loadExpectedPlan("query_string_on_message_filtered_sorted_num.yaml");
+    String expected = loadExpectedPlan("big5/query_string_on_message_filtered_sorted_num.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -221,7 +221,7 @@ public void query_string_on_message_filtered_sorted_num() throws IOException {
   public void range() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range.ppl"));
     timing(summary, "range", ppl);
-    String expected = loadExpectedPlan("range.yaml");
+    String expected = loadExpectedPlan("big5/range.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -229,7 +229,7 @@ public void range() throws IOException {
   public void range_auto_date_histo() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_auto_date_histo.ppl"));
     timing(summary, "range_auto_date_histo", ppl);
-    String expected = loadExpectedPlan("range_auto_date_histo.yaml");
+    String expected = loadExpectedPlan("big5/range_auto_date_histo.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -237,7 +237,7 @@ public void range_auto_date_histo() throws IOException {
   public void range_auto_date_histo_with_metrics() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_auto_date_histo_with_metrics.ppl"));
     timing(summary, "range_auto_date_histo_with_metrics", ppl);
-    String expected = loadExpectedPlan("range_auto_date_histo_with_metrics.yaml");
+    String expected = loadExpectedPlan("big5/range_auto_date_histo_with_metrics.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -245,7 +245,7 @@ public void range_auto_date_histo_with_metrics() throws IOException {
   public void range_numeric() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_numeric.ppl"));
     timing(summary, "range_numeric", ppl);
-    String expected = loadExpectedPlan("range_numeric.yaml");
+    String expected = loadExpectedPlan("big5/range_numeric.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -254,7 +254,8 @@ public void range_field_conjunction_big_range_big_term_query() throws IOExceptio
     String ppl =
         sanitize(loadExpectedQuery("range_field_conjunction_big_range_big_term_query.ppl"));
     timing(summary, "range_field_conjunction_big_range_big_term_query", ppl);
-    String expected = loadExpectedPlan("range_field_conjunction_big_range_big_term_query.yaml");
+    String expected =
+        loadExpectedPlan("big5/range_field_conjunction_big_range_big_term_query.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -263,7 +264,8 @@ public void range_field_conjunction_small_range_big_term_query() throws IOExcept
     String ppl =
         sanitize(loadExpectedQuery("range_field_conjunction_small_range_big_term_query.ppl"));
     timing(summary, "range_field_conjunction_small_range_big_term_query", ppl);
-    String expected = loadExpectedPlan("range_field_conjunction_small_range_big_term_query.yaml");
+    String expected =
+        loadExpectedPlan("big5/range_field_conjunction_small_range_big_term_query.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -272,7 +274,8 @@ public void range_field_conjunction_small_range_small_term_query() throws IOExce
     String ppl =
         sanitize(loadExpectedQuery("range_field_conjunction_small_range_small_term_query.ppl"));
     timing(summary, "range_field_conjunction_small_range_small_term_query", ppl);
-    String expected = loadExpectedPlan("range_field_conjunction_small_range_small_term_query.yaml");
+    String expected =
+        loadExpectedPlan("big5/range_field_conjunction_small_range_small_term_query.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -281,7 +284,8 @@ public void range_field_disjunction_big_range_small_term_query() throws IOExcept
     String ppl =
         sanitize(loadExpectedQuery("range_field_disjunction_big_range_small_term_query.ppl"));
     timing(summary, "range_field_disjunction_big_range_small_term_query", ppl);
-    String expected = loadExpectedPlan("range_field_disjunction_big_range_small_term_query.yaml");
+    String expected =
+        loadExpectedPlan("big5/range_field_disjunction_big_range_small_term_query.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -289,7 +293,7 @@ public void range_field_disjunction_big_range_small_term_query() throws IOExcept
   public void range_with_asc_sort() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_with_asc_sort.ppl"));
     timing(summary, "range_with_asc_sort", ppl);
-    String expected = loadExpectedPlan("range_with_asc_sort.yaml");
+    String expected = loadExpectedPlan("big5/range_with_asc_sort.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -297,7 +301,7 @@ public void range_with_asc_sort() throws IOException {
   public void range_with_desc_sort() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_with_desc_sort.ppl"));
     timing(summary, "range_with_desc_sort", ppl);
-    String expected = loadExpectedPlan("range_with_desc_sort.yaml");
+    String expected = loadExpectedPlan("big5/range_with_desc_sort.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -305,7 +309,7 @@ public void range_with_desc_sort() throws IOException {
   public void scroll() throws IOException {
     String ppl = sanitize(loadExpectedQuery("scroll.ppl"));
     timing(summary, "scroll", ppl);
-    String expected = loadExpectedPlan("scroll.yaml");
+    String expected = loadExpectedPlan("big5/scroll.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -313,7 +317,7 @@ public void scroll() throws IOException {
   public void sort_keyword_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_keyword_can_match_shortcut.ppl"));
     timing(summary, "sort_keyword_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("sort_keyword_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/sort_keyword_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -321,7 +325,7 @@ public void sort_keyword_can_match_shortcut() throws IOException {
   public void sort_keyword_no_can_match_shortcut() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_keyword_no_can_match_shortcut.ppl"));
     timing(summary, "sort_keyword_no_can_match_shortcut", ppl);
-    String expected = loadExpectedPlan("sort_keyword_no_can_match_shortcut.yaml");
+    String expected = loadExpectedPlan("big5/sort_keyword_no_can_match_shortcut.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -329,7 +333,7 @@ public void sort_keyword_no_can_match_shortcut() throws IOException {
   public void sort_numeric_asc() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_numeric_asc.ppl"));
     timing(summary, "sort_numeric_asc", ppl);
-    String expected = loadExpectedPlan("sort_numeric_asc.yaml");
+    String expected = loadExpectedPlan("big5/sort_numeric_asc.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -337,7 +341,7 @@ public void sort_numeric_asc() throws IOException {
   public void sort_numeric_asc_with_match() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_numeric_asc_with_match.ppl"));
     timing(summary, "sort_numeric_asc_with_match", ppl);
-    String expected = loadExpectedPlan("sort_numeric_asc_with_match.yaml");
+    String expected = loadExpectedPlan("big5/sort_numeric_asc_with_match.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -345,7 +349,7 @@ public void sort_numeric_asc_with_match() throws IOException {
   public void sort_numeric_desc() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_numeric_desc.ppl"));
     timing(summary, "sort_numeric_desc", ppl);
-    String expected = loadExpectedPlan("sort_numeric_desc.yaml");
+    String expected = loadExpectedPlan("big5/sort_numeric_desc.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -353,7 +357,7 @@ public void sort_numeric_desc() throws IOException {
   public void sort_numeric_desc_with_match() throws IOException {
     String ppl = sanitize(loadExpectedQuery("sort_numeric_desc_with_match.ppl"));
     timing(summary, "sort_numeric_desc_with_match", ppl);
-    String expected = loadExpectedPlan("sort_numeric_desc_with_match.yaml");
+    String expected = loadExpectedPlan("big5/sort_numeric_desc_with_match.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -361,7 +365,7 @@ public void sort_numeric_desc_with_match() throws IOException {
   public void term() throws IOException {
     String ppl = sanitize(loadExpectedQuery("term.ppl"));
     timing(summary, "term", ppl);
-    String expected = loadExpectedPlan("term.yaml");
+    String expected = loadExpectedPlan("big5/term.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -369,7 +373,7 @@ public void term() throws IOException {
   public void terms_significant_1() throws IOException {
     String ppl = sanitize(loadExpectedQuery("terms_significant_1.ppl"));
     timing(summary, "terms_significant_1", ppl);
-    String expected = loadExpectedPlan("terms_significant_1.yaml");
+    String expected = loadExpectedPlan("big5/terms_significant_1.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -377,7 +381,7 @@ public void terms_significant_1() throws IOException {
   public void terms_significant_2() throws IOException {
     String ppl = sanitize(loadExpectedQuery("terms_significant_2.ppl"));
     timing(summary, "terms_significant_2", ppl);
-    String expected = loadExpectedPlan("terms_significant_2.yaml");
+    String expected = loadExpectedPlan("big5/terms_significant_2.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -385,7 +389,7 @@ public void terms_significant_2() throws IOException {
   public void range_agg_1() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_agg_1.ppl"));
     timing(summary, "range_agg_1", ppl);
-    String expected = loadExpectedPlan("range_agg_1.yaml");
+    String expected = loadExpectedPlan("big5/range_agg_1.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -393,7 +397,7 @@ public void range_agg_1() throws IOException {
   public void range_agg_2() throws IOException {
     String ppl = sanitize(loadExpectedQuery("range_agg_2.ppl"));
     timing(summary, "range_agg_2", ppl);
-    String expected = loadExpectedPlan("range_agg_2.yaml");
+    String expected = loadExpectedPlan("big5/range_agg_2.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -401,7 +405,7 @@ public void range_agg_2() throws IOException {
   public void cardinality_agg_high() throws IOException {
     String ppl = sanitize(loadExpectedQuery("cardinality_agg_high.ppl"));
     timing(summary, "cardinality_agg_high", ppl);
-    String expected = loadExpectedPlan("cardinality_agg_high.yaml");
+    String expected = loadExpectedPlan("big5/cardinality_agg_high.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -409,7 +413,7 @@ public void cardinality_agg_high() throws IOException {
   public void cardinality_agg_high_2() throws IOException {
     String ppl = sanitize(loadExpectedQuery("cardinality_agg_high_2.ppl"));
     timing(summary, "cardinality_agg_high_2", ppl);
-    String expected = loadExpectedPlan("cardinality_agg_high_2.yaml");
+    String expected = loadExpectedPlan("big5/cardinality_agg_high_2.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
@@ -417,7 +421,7 @@ public void cardinality_agg_high_2() throws IOException {
   public void cardinality_agg_low() throws IOException {
     String ppl = sanitize(loadExpectedQuery("cardinality_agg_low.ppl"));
     timing(summary, "cardinality_agg_low", ppl);
-    String expected = loadExpectedPlan("cardinality_agg_low.yaml");
+    String expected = loadExpectedPlan("big5/cardinality_agg_low.yaml");
     assertYamlEqualsIgnoreId(expected, explainQueryYaml(ppl));
   }
 
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/asc_sort_timestamp_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_timestamp_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/asc_sort_with_after_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_with_after_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/asc_sort_with_after_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/asc_sort_with_after_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_high.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_high.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_high.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_high.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_high_2.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_high_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_high_2.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_high_2.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_low.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_low.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/cardinality_agg_low.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/cardinality_agg_low.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/composite_date_histogram_daily.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/composite_date_histogram_daily.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/composite_date_histogram_daily.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/composite_date_histogram_daily.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/composite_terms.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/composite_terms.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/composite_terms.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/composite_terms.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/composite_terms_keyword.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/composite_terms_keyword.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/composite_terms_keyword.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/composite_terms_keyword.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/date_histogram_hourly_agg.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/date_histogram_hourly_agg.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/date_histogram_hourly_agg.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/date_histogram_hourly_agg.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/date_histogram_minute_agg.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/date_histogram_minute_agg.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/date_histogram_minute_agg.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/date_histogram_minute_agg.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/default.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/default.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/default.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/default.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/desc_sort_timestamp_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_timestamp_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/desc_sort_with_after_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_with_after_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/desc_sort_with_after_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/desc_sort_with_after_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/keyword_in_range.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_in_range.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/keyword_in_range.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_in_range.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/keyword_terms.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms.yaml
similarity index 85%
rename from integ-test/src/test/resources/expectedOutput/calcite/keyword_terms.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms.yaml
index da777dc2784..30eb5cfddab 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/keyword_terms.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[IS NOT NULL($34)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, big5]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},station=COUNT()), PROJECT->[station, aws.cloudwatch.log_stream], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->500, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"aws.cloudwatch.log_stream":{"terms":{"field":"aws.cloudwatch.log_stream","size":500,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"station":"desc"},{"_key":"asc"}]},"aggregations":{"station":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},station=COUNT()), PROJECT->[station, aws.cloudwatch.log_stream], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->500, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"aws.cloudwatch.log_stream":{"terms":{"field":"aws.cloudwatch.log_stream","size":500,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/keyword_terms_low_cardinality.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms_low_cardinality.yaml
similarity index 85%
rename from integ-test/src/test/resources/expectedOutput/calcite/keyword_terms_low_cardinality.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms_low_cardinality.yaml
index fd4f1b547e3..ddb924bedf5 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/keyword_terms_low_cardinality.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/big5/keyword_terms_low_cardinality.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[IS NOT NULL($34)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, big5]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},country=COUNT()), PROJECT->[country, aws.cloudwatch.log_stream], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->50, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"aws.cloudwatch.log_stream":{"terms":{"field":"aws.cloudwatch.log_stream","size":50,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"country":"desc"},{"_key":"asc"}]},"aggregations":{"country":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},country=COUNT()), PROJECT->[country, aws.cloudwatch.log_stream], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->50, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"aws.cloudwatch.log_stream":{"terms":{"field":"aws.cloudwatch.log_stream","size":50,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/multi_terms_keyword.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/multi_terms_keyword.yaml
similarity index 90%
rename from integ-test/src/test/resources/expectedOutput/calcite/multi_terms_keyword.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/multi_terms_keyword.yaml
index 4b52e71862f..89708ca4d4b 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/multi_terms_keyword.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/big5/multi_terms_keyword.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[AND(>=($17, TIMESTAMP('2023-01-05 00:00:00':VARCHAR)), <($17, TIMESTAMP('2023-01-05 05:00:00':VARCHAR)))])
                   CalciteLogicalIndexScan(table=[[OpenSearch, big5]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[PROJECT->[process.name, cloud.region, @timestamp], FILTER->SEARCH($2, Sarg[['2023-01-05 00:00:00':VARCHAR..'2023-01-05 05:00:00':VARCHAR)]:VARCHAR), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[count(), process.name, cloud.region], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"range":{"@timestamp":{"from":"2023-01-05T00:00:00.000Z","to":"2023-01-05T05:00:00.000Z","include_lower":true,"include_upper":false,"format":"date_time","boost":1.0}}},"_source":{"includes":["process.name","cloud.region","@timestamp"],"excludes":[]},"aggregations":{"process.name|cloud.region":{"multi_terms":{"terms":[{"field":"process.name"},{"field":"cloud.region"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"desc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, big5]], PushDownContext=[[PROJECT->[process.name, cloud.region, @timestamp], FILTER->SEARCH($2, Sarg[['2023-01-05 00:00:00':VARCHAR..'2023-01-05 05:00:00':VARCHAR)]:VARCHAR), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[count(), process.name, cloud.region], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"range":{"@timestamp":{"from":"2023-01-05T00:00:00.000Z","to":"2023-01-05T05:00:00.000Z","include_lower":true,"include_upper":false,"format":"date_time","boost":1.0}}},"_source":{"includes":["process.name","cloud.region","@timestamp"],"excludes":[]},"aggregations":{"process.name|cloud.region":{"multi_terms":{"terms":[{"field":"process.name"},{"field":"cloud.region"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message_filtered.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message_filtered.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message_filtered.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message_filtered.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message_filtered_sorted_num.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message_filtered_sorted_num.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/query_string_on_message_filtered_sorted_num.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/query_string_on_message_filtered_sorted_num.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_agg_1.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_agg_1.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_agg_1.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_agg_1.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_agg_2.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_agg_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_agg_2.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_agg_2.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_auto_date_histo.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_auto_date_histo.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_auto_date_histo.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_auto_date_histo.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_auto_date_histo_with_metrics.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_auto_date_histo_with_metrics.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_auto_date_histo_with_metrics.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_auto_date_histo_with_metrics.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_big_range_big_term_query.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_big_range_big_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_big_range_big_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_big_range_big_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_small_range_big_term_query.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_small_range_big_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_small_range_big_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_small_range_big_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_small_range_small_term_query.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_small_range_small_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_field_conjunction_small_range_small_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_conjunction_small_range_small_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_field_disjunction_big_range_small_term_query.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_disjunction_big_range_small_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_field_disjunction_big_range_small_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_field_disjunction_big_range_small_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_numeric.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_numeric.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_numeric.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_numeric.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_with_asc_sort.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_with_asc_sort.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_with_asc_sort.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_with_asc_sort.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/range_with_desc_sort.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/range_with_desc_sort.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/range_with_desc_sort.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/range_with_desc_sort.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/scroll.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/scroll.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/scroll.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/scroll.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_keyword_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_keyword_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_keyword_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_keyword_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_keyword_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_keyword_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_keyword_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_keyword_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_asc.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_asc.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_asc.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_asc.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_asc_with_match.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_asc_with_match.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_asc_with_match.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_asc_with_match.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_desc.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_desc.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_desc.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_desc.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_desc_with_match.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_desc_with_match.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/sort_numeric_desc_with_match.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/sort_numeric_desc_with_match.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/term.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/term.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/term.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/term.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/terms_significant_1.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/terms_significant_1.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/terms_significant_1.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/terms_significant_1.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/terms_significant_2.yaml b/integ-test/src/test/resources/expectedOutput/calcite/big5/terms_significant_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/calcite/terms_significant_2.yaml
rename to integ-test/src/test/resources/expectedOutput/calcite/big5/terms_significant_2.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q13.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q13.yaml
index b18a08c410a..8c7797a4ad7 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q13.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q13.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[<>($63, '')])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER-><>($63, ''), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[c, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggregations":{"SearchPhrase":{"terms":{"field":"SearchPhrase","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER-><>($63, ''), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[c, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggregations":{"SearchPhrase":{"terms":{"field":"SearchPhrase","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q15.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q15.yaml
index 2b73585ff73..3b0000ec80a 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q15.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q15.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[<>($63, '')])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[SearchPhrase, SearchEngineID], FILTER->AND(<>($0, ''), IS NOT NULL($1)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},c=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[c, SearchEngineID, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},{"exists":{"field":"SearchEngineID","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["SearchPhrase","SearchEngineID"],"excludes":[]},"aggregations":{"SearchEngineID|SearchPhrase":{"multi_terms":{"terms":[{"field":"SearchEngineID"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[SearchPhrase, SearchEngineID], FILTER->AND(<>($0, ''), IS NOT NULL($1)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},c=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[c, SearchEngineID, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},{"exists":{"field":"SearchEngineID","boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["SearchPhrase","SearchEngineID"],"excludes":[]},"aggregations":{"SearchEngineID|SearchPhrase":{"multi_terms":{"terms":[{"field":"SearchEngineID"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q16.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q16.yaml
index aad05d10c58..4110e1a12d0 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q16.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q16.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[IS NOT NULL($84)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), PROJECT->[count(), UserID], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID":{"terms":{"field":"UserID","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"desc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), PROJECT->[count(), UserID], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID":{"terms":{"field":"UserID","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q17.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q17.yaml
index 2f2b2f0a897..46855028754 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q17.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q17.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[AND(IS NOT NULL($84), IS NOT NULL($63))])
                 CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), PROJECT->[count(), UserID, SearchPhrase], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID|SearchPhrase":{"multi_terms":{"terms":[{"field":"UserID"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"desc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), PROJECT->[count(), UserID, SearchPhrase], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID|SearchPhrase":{"multi_terms":{"terms":[{"field":"UserID"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q19.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q19.yaml
index 54d8b79cbc3..95e42c3147e 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q19.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q19.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalProject(EventDate=[$0], URLRegionID=[$1], HasGCLID=[$2], Income=[$3], Interests=[$4], Robotness=[$5], BrowserLanguage=[$6], CounterClass=[$7], BrowserCountry=[$8], OriginalURL=[$9], ClientTimeZone=[$10], RefererHash=[$11], TraficSourceID=[$12], HitColor=[$13], RefererRegionID=[$14], URLCategoryID=[$15], LocalEventTime=[$16], EventTime=[$17], UTMTerm=[$18], AdvEngineID=[$19], UserAgentMinor=[$20], UserAgentMajor=[$21], RemoteIP=[$22], Sex=[$23], JavaEnable=[$24], URLHash=[$25], URL=[$26], ParamOrderID=[$27], OpenstatSourceID=[$28], HTTPError=[$29], SilverlightVersion3=[$30], MobilePhoneModel=[$31], SilverlightVersion4=[$32], SilverlightVersion1=[$33], SilverlightVersion2=[$34], IsDownload=[$35], IsParameter=[$36], CLID=[$37], FlashMajor=[$38], FlashMinor=[$39], UTMMedium=[$40], WatchID=[$41], DontCountHits=[$42], CookieEnable=[$43], HID=[$44], SocialAction=[$45], WindowName=[$46], ConnectTiming=[$47], PageCharset=[$48], IsLink=[$49], IsArtifical=[$50], JavascriptEnable=[$51], ClientEventTime=[$52], DNSTiming=[$53], CodeVersion=[$54], ResponseEndTiming=[$55], FUniqID=[$56], WindowClientHeight=[$57], OpenstatServiceName=[$58], UTMContent=[$59], HistoryLength=[$60], IsOldCounter=[$61], MobilePhone=[$62], SearchPhrase=[$63], FlashMinor2=[$64], SearchEngineID=[$65], IsEvent=[$66], UTMSource=[$67], RegionID=[$68], OpenstatAdID=[$69], UTMCampaign=[$70], GoodEvent=[$71], IsRefresh=[$72], ParamCurrency=[$73], Params=[$74], ResolutionHeight=[$75], ClientIP=[$76], FromTag=[$77], ParamCurrencyID=[$78], ResponseStartTiming=[$79], ResolutionWidth=[$80], SendTiming=[$81], RefererCategoryID=[$82], OpenstatCampaignID=[$83], UserID=[$84], WithHash=[$85], UserAgent=[$86], ParamPrice=[$87], ResolutionDepth=[$88], IsMobile=[$89], Age=[$90], SocialSourceNetworkID=[$91], OpenerName=[$92], OS=[$93], IsNotBounce=[$94], Referer=[$95], NetMinor=[$96], Title=[$97], NetMajor=[$98], IPNetworkID=[$99], FetchTiming=[$100], SocialNetwork=[$101], SocialSourcePage=[$102], CounterID=[$103], WindowClientWidth=[$104], _id=[$105], _index=[$106], _score=[$107], _maxscore=[$108], _sort=[$109], _routing=[$110], m=[EXTRACT('minute':VARCHAR, $17)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1, 2},count()=COUNT()), PROJECT->[count(), UserID, m, SearchPhrase], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID|m|SearchPhrase":{"multi_terms":{"terms":[{"field":"UserID"},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQCZnsKICAib3AiOiB7CiAgICAibmFtZSI6ICJFWFRSQUNUIiwKICAgICJraW5kIjogIk9USEVSX0ZVTkNUSU9OIiwKICAgICJzeW50YXgiOiAiRlVOQ1RJT04iCiAgfSwKICAib3BlcmFuZHMiOiBbCiAgICB7CiAgICAgICJkeW5hbWljUGFyYW0iOiAwLAogICAgICAidHlwZSI6IHsKICAgICAgICAidHlwZSI6ICJWQVJDSEFSIiwKICAgICAgICAibnVsbGFibGUiOiBmYWxzZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgImR5bmFtaWNQYXJhbSI6IDEsCiAgICAgICJ0eXBlIjogewogICAgICAgICJ1ZHQiOiAiRVhQUl9USU1FU1RBTVAiLAogICAgICAgICJ0eXBlIjogIlZBUkNIQVIiLAogICAgICAgICJudWxsYWJsZSI6IHRydWUsCiAgICAgICAgInByZWNpc2lvbiI6IC0xCiAgICAgIH0KICAgIH0KICBdLAogICJjbGFzcyI6ICJvcmcub3BlbnNlYXJjaC5zcWwuZXhwcmVzc2lvbi5mdW5jdGlvbi5Vc2VyRGVmaW5lZEZ1bmN0aW9uQnVpbGRlciQxIiwKICAidHlwZSI6IHsKICAgICJ0eXBlIjogIkJJR0lOVCIsCiAgICAibnVsbGFibGUiOiB0cnVlCiAgfSwKICAiZGV0ZXJtaW5pc3RpYyI6IHRydWUsCiAgImR5bmFtaWMiOiBmYWxzZQp9\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[2,0],"DIGESTS":["minute","EventTime"]}},"value_type":"long"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"desc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1, 2},count()=COUNT()), PROJECT->[count(), UserID, m, SearchPhrase], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"UserID|m|SearchPhrase":{"multi_terms":{"terms":[{"field":"UserID"},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQCZnsKICAib3AiOiB7CiAgICAibmFtZSI6ICJFWFRSQUNUIiwKICAgICJraW5kIjogIk9USEVSX0ZVTkNUSU9OIiwKICAgICJzeW50YXgiOiAiRlVOQ1RJT04iCiAgfSwKICAib3BlcmFuZHMiOiBbCiAgICB7CiAgICAgICJkeW5hbWljUGFyYW0iOiAwLAogICAgICAidHlwZSI6IHsKICAgICAgICAidHlwZSI6ICJWQVJDSEFSIiwKICAgICAgICAibnVsbGFibGUiOiBmYWxzZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfSwKICAgIHsKICAgICAgImR5bmFtaWNQYXJhbSI6IDEsCiAgICAgICJ0eXBlIjogewogICAgICAgICJ1ZHQiOiAiRVhQUl9USU1FU1RBTVAiLAogICAgICAgICJ0eXBlIjogIlZBUkNIQVIiLAogICAgICAgICJudWxsYWJsZSI6IHRydWUsCiAgICAgICAgInByZWNpc2lvbiI6IC0xCiAgICAgIH0KICAgIH0KICBdLAogICJjbGFzcyI6ICJvcmcub3BlbnNlYXJjaC5zcWwuZXhwcmVzc2lvbi5mdW5jdGlvbi5Vc2VyRGVmaW5lZEZ1bmN0aW9uQnVpbGRlciQxIiwKICAidHlwZSI6IHsKICAgICJ0eXBlIjogIkJJR0lOVCIsCiAgICAibnVsbGFibGUiOiB0cnVlCiAgfSwKICAiZGV0ZXJtaW5pc3RpYyI6IHRydWUsCiAgImR5bmFtaWMiOiBmYWxzZQp9\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[2,0],"DIGESTS":["minute","EventTime"]}},"value_type":"long"},{"field":"SearchPhrase"}],"size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q22.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q22.yaml
index c40758c1b3d..513568e063b 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q22.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q22.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[AND(LIKE($26, '%google%', '\'), <>($63, ''))])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[URL, SearchPhrase], FILTER->AND(LIKE($0, '%google%', '\'), <>($1, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[c, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"wildcard":{"URL":{"wildcard":"*google*","boost":1.0}}},{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["URL","SearchPhrase"],"excludes":[]},"aggregations":{"SearchPhrase":{"terms":{"field":"SearchPhrase","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[URL, SearchPhrase], FILTER->AND(LIKE($0, '%google%', '\'), <>($1, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[c, SearchPhrase], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"wildcard":{"URL":{"wildcard":"*google*","boost":1.0}}},{"bool":{"must":[{"exists":{"field":"SearchPhrase","boost":1.0}}],"must_not":[{"term":{"SearchPhrase":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["URL","SearchPhrase"],"excludes":[]},"aggregations":{"SearchPhrase":{"terms":{"field":"SearchPhrase","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q34.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q34.yaml
index 220e94f3bbb..97f48a87f28 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q34.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q34.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[IS NOT NULL($26)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), PROJECT->[c, URL], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), PROJECT->[c, URL], SORT_AGG_METRICS->[0 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q35.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q35.yaml
index da70cfee61a..439c445af4b 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q35.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q35.yaml
@@ -10,4 +10,4 @@ calcite:
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
     EnumerableCalc(expr#0..1=[{inputs}], expr#2=[1], c=[$t1], const=[$t2], URL=[$t0])
-      CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+      CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q36.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q36.yaml
index 4f05d895b3a..55560215771 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q36.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q36.yaml
@@ -10,4 +10,4 @@ calcite:
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
     EnumerableCalc(expr#0..1=[{inputs}], expr#2=[1], expr#3=[-($t0, $t2)], expr#4=[2], expr#5=[-($t0, $t4)], expr#6=[3], expr#7=[-($t0, $t6)], c=[$t1], ClientIP=[$t0], ClientIP - 1=[$t3], ClientIP - 2=[$t5], ClientIP - 3=[$t7])
-      CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER->IS NOT NULL($76), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"exists":{"field":"ClientIP","boost":1.0}},"aggregations":{"ClientIP":{"terms":{"field":"ClientIP","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"c":"desc"},{"_key":"asc"}]},"aggregations":{"c":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+      CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER->IS NOT NULL($76), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},c=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"exists":{"field":"ClientIP","boost":1.0}},"aggregations":{"ClientIP":{"terms":{"field":"ClientIP","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q37.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q37.yaml
index 71446de8af9..ffe16fc8444 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q37.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q37.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[AND(=($103, 62), >=($0, TIMESTAMP('2013-07-01 00:00:00':VARCHAR)), <=($0, TIMESTAMP('2013-07-31 00:00:00':VARCHAR)), =($42, 0), =($72, 0), <>($26, ''))])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URL, DontCountHits, IsRefresh, CounterID], FILTER->AND(=($4, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($2, 0), =($3, 0), <>($1, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, URL], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"URL","boost":1.0}}],"must_not":[{"term":{"URL":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URL","DontCountHits","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URL, DontCountHits, IsRefresh, CounterID], FILTER->AND(=($4, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($2, 0), =($3, 0), <>($1, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, URL], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"URL","boost":1.0}}],"must_not":[{"term":{"URL":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URL","DontCountHits","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URL":{"terms":{"field":"URL","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q38.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q38.yaml
index f41ff988614..97b0fd3db2f 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q38.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q38.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[AND(=($103, 62), >=($0, TIMESTAMP('2013-07-01 00:00:00':VARCHAR)), <=($0, TIMESTAMP('2013-07-31 00:00:00':VARCHAR)), =($42, 0), =($72, 0), <>($97, ''))])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, DontCountHits, IsRefresh, Title, CounterID], FILTER->AND(=($4, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($1, 0), =($2, 0), <>($3, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, Title], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"Title","boost":1.0}}],"must_not":[{"term":{"Title":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","DontCountHits","IsRefresh","Title","CounterID"],"excludes":[]},"aggregations":{"Title":{"terms":{"field":"Title","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, DontCountHits, IsRefresh, Title, CounterID], FILTER->AND(=($4, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($1, 0), =($2, 0), <>($3, '')), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, Title], LIMIT->10, LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"Title","boost":1.0}}],"must_not":[{"term":{"Title":{"value":"","boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","DontCountHits","IsRefresh","Title","CounterID"],"excludes":[]},"aggregations":{"Title":{"terms":{"field":"Title","size":10,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q39.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q39.yaml
index f2fbd2057cb..8b26cbbb03b 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q39.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q39.yaml
@@ -11,4 +11,4 @@ calcite:
   physical: |
     EnumerableLimit(fetch=[10000])
       EnumerableLimit(offset=[1000], fetch=[10])
-        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URL, IsDownload, IsLink, IsRefresh, CounterID], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), <>($3, 0), =($2, 0)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, URL]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"IsLink","boost":1.0}}],"must_not":[{"term":{"IsLink":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},{"term":{"IsDownload":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URL","IsDownload","IsLink","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URL":{"terms":{"field":"URL","size":1010,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URL, IsDownload, IsLink, IsRefresh, CounterID], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), <>($3, 0), =($2, 0)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},PageViews=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[PageViews, URL]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"bool":{"must":[{"exists":{"field":"IsLink","boost":1.0}}],"must_not":[{"term":{"IsLink":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},{"term":{"IsDownload":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URL","IsDownload","IsLink","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URL":{"terms":{"field":"URL","size":1010,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q40.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q40.yaml
index b2ae45002ed..b7ae1f5e396 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q40.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q40.yaml
@@ -13,4 +13,4 @@ calcite:
     EnumerableCalc(expr#0..5=[{inputs}], PageViews=[$t5], TraficSourceID=[$t0], SearchEngineID=[$t1], AdvEngineID=[$t2], Src=[$t3], Dst=[$t4])
       EnumerableLimit(fetch=[10000])
         EnumerableLimit(offset=[1000], fetch=[10])
-          CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, TraficSourceID, AdvEngineID, URL, SearchEngineID, IsRefresh, Referer, CounterID], FILTER->AND(=($7, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($5, 0)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1, 2, 3, 4},PageViews=COUNT()), SORT_AGG_METRICS->[5 DESC LAST], LIMIT->[10 from 1000]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","TraficSourceID","AdvEngineID","URL","SearchEngineID","IsRefresh","Referer","CounterID"],"excludes":[]},"aggregations":{"TraficSourceID|SearchEngineID|AdvEngineID|Src|Dst":{"multi_terms":{"terms":[{"field":"TraficSourceID"},{"field":"SearchEngineID"},{"field":"AdvEngineID"},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQGCnsKICAib3AiOiB7CiAgICAibmFtZSI6ICJDQVNFIiwKICAgICJraW5kIjogIkNBU0UiLAogICAgInN5bnRheCI6ICJTUEVDSUFMIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAib3AiOiB7CiAgICAgICAgIm5hbWUiOiAiQU5EIiwKICAgICAgICAia2luZCI6ICJBTkQiLAogICAgICAgICJzeW50YXgiOiAiQklOQVJZIgogICAgICB9LAogICAgICAib3BlcmFuZHMiOiBbCiAgICAgICAgewogICAgICAgICAgIm9wIjogewogICAgICAgICAgICAibmFtZSI6ICI9IiwKICAgICAgICAgICAgImtpbmQiOiAiRVFVQUxTIiwKICAgICAgICAgICAgInN5bnRheCI6ICJCSU5BUlkiCiAgICAgICAgICB9LAogICAgICAgICAgIm9wZXJhbmRzIjogWwogICAgICAgICAgICB7CiAgICAgICAgICAgICAgImR5bmFtaWNQYXJhbSI6IDAsCiAgICAgICAgICAgICAgInR5cGUiOiB7CiAgICAgICAgICAgICAgICAidHlwZSI6ICJTTUFMTElOVCIsCiAgICAgICAgICAgICAgICAibnVsbGFibGUiOiB0cnVlCiAgICAgICAgICAgICAgfQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgImR5bmFtaWNQYXJhbSI6IDEsCiAgICAgICAgICAgICAgInR5cGUiOiB7CiAgICAgICAgICAgICAgICAidHlwZSI6ICJJTlRFR0VSIiwKICAgICAgICAgICAgICAgICJudWxsYWJsZSI6IGZhbHNlCiAgICAgICAgICAgICAgfQogICAgICAgICAgICB9CiAgICAgICAgICBdCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAib3AiOiB7CiAgICAgICAgICAgICJuYW1lIjogIj0iLAogICAgICAgICAgICAia2luZCI6ICJFUVVBTFMiLAogICAgICAgICAgICAic3ludGF4IjogIkJJTkFSWSIKICAgICAgICAgIH0sCiAgICAgICAgICAib3BlcmFuZHMiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAiZHluYW1pY1BhcmFtIjogMiwKICAgICAgICAgICAgICAidHlwZSI6IHsKICAgICAgICAgICAgICAgICJ0eXBlIjogIlNNQUxMSU5UIiwKICAgICAgICAgICAgICAgICJudWxsYWJsZSI6IHRydWUKICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAiZHluYW1pY1BhcmFtIjogMywKICAgICAgICAgICAgICAidHlwZSI6IHsKICAgICAgICAgICAgICAgICJ0eXBlIjogIklOVEVHRVIiLAogICAgICAgICAgICAgICAgIm51bGxhYmxlIjogZmFsc2UKICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgIF0KICAgICAgICB9CiAgICAgIF0KICAgIH0sCiAgICB7CiAgICAgICJkeW5hbWljUGFyYW0iOiA0LAogICAgICAidHlwZSI6IHsKICAgICAgICAidHlwZSI6ICJWQVJDSEFSIiwKICAgICAgICAibnVsbGFibGUiOiB0cnVlLAogICAgICAgICJwcmVjaXNpb24iOiAtMQogICAgICB9CiAgICB9LAogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogNSwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogZmFsc2UsCiAgICAgICAgInByZWNpc2lvbiI6IC0xCiAgICAgIH0KICAgIH0KICBdCn0=\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0,2,0,2,0,2],"DIGESTS":["SearchEngineID",0,"AdvEngineID",0,"Referer",""]}}},{"field":"URL"}],"size":1010,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+          CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, TraficSourceID, AdvEngineID, URL, SearchEngineID, IsRefresh, Referer, CounterID], FILTER->AND(=($7, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($5, 0)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1, 2, 3, 4},PageViews=COUNT()), SORT_AGG_METRICS->[5 DESC LAST], LIMIT->[10 from 1000]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","TraficSourceID","AdvEngineID","URL","SearchEngineID","IsRefresh","Referer","CounterID"],"excludes":[]},"aggregations":{"TraficSourceID|SearchEngineID|AdvEngineID|Src|Dst":{"multi_terms":{"terms":[{"field":"TraficSourceID"},{"field":"SearchEngineID"},{"field":"AdvEngineID"},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQGCnsKICAib3AiOiB7CiAgICAibmFtZSI6ICJDQVNFIiwKICAgICJraW5kIjogIkNBU0UiLAogICAgInN5bnRheCI6ICJTUEVDSUFMIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAib3AiOiB7CiAgICAgICAgIm5hbWUiOiAiQU5EIiwKICAgICAgICAia2luZCI6ICJBTkQiLAogICAgICAgICJzeW50YXgiOiAiQklOQVJZIgogICAgICB9LAogICAgICAib3BlcmFuZHMiOiBbCiAgICAgICAgewogICAgICAgICAgIm9wIjogewogICAgICAgICAgICAibmFtZSI6ICI9IiwKICAgICAgICAgICAgImtpbmQiOiAiRVFVQUxTIiwKICAgICAgICAgICAgInN5bnRheCI6ICJCSU5BUlkiCiAgICAgICAgICB9LAogICAgICAgICAgIm9wZXJhbmRzIjogWwogICAgICAgICAgICB7CiAgICAgICAgICAgICAgImR5bmFtaWNQYXJhbSI6IDAsCiAgICAgICAgICAgICAgInR5cGUiOiB7CiAgICAgICAgICAgICAgICAidHlwZSI6ICJTTUFMTElOVCIsCiAgICAgICAgICAgICAgICAibnVsbGFibGUiOiB0cnVlCiAgICAgICAgICAgICAgfQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgImR5bmFtaWNQYXJhbSI6IDEsCiAgICAgICAgICAgICAgInR5cGUiOiB7CiAgICAgICAgICAgICAgICAidHlwZSI6ICJJTlRFR0VSIiwKICAgICAgICAgICAgICAgICJudWxsYWJsZSI6IGZhbHNlCiAgICAgICAgICAgICAgfQogICAgICAgICAgICB9CiAgICAgICAgICBdCiAgICAgICAgfSwKICAgICAgICB7CiAgICAgICAgICAib3AiOiB7CiAgICAgICAgICAgICJuYW1lIjogIj0iLAogICAgICAgICAgICAia2luZCI6ICJFUVVBTFMiLAogICAgICAgICAgICAic3ludGF4IjogIkJJTkFSWSIKICAgICAgICAgIH0sCiAgICAgICAgICAib3BlcmFuZHMiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAiZHluYW1pY1BhcmFtIjogMiwKICAgICAgICAgICAgICAidHlwZSI6IHsKICAgICAgICAgICAgICAgICJ0eXBlIjogIlNNQUxMSU5UIiwKICAgICAgICAgICAgICAgICJudWxsYWJsZSI6IHRydWUKICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAiZHluYW1pY1BhcmFtIjogMywKICAgICAgICAgICAgICAidHlwZSI6IHsKICAgICAgICAgICAgICAgICJ0eXBlIjogIklOVEVHRVIiLAogICAgICAgICAgICAgICAgIm51bGxhYmxlIjogZmFsc2UKICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAgIF0KICAgICAgICB9CiAgICAgIF0KICAgIH0sCiAgICB7CiAgICAgICJkeW5hbWljUGFyYW0iOiA0LAogICAgICAidHlwZSI6IHsKICAgICAgICAidHlwZSI6ICJWQVJDSEFSIiwKICAgICAgICAibnVsbGFibGUiOiB0cnVlLAogICAgICAgICJwcmVjaXNpb24iOiAtMQogICAgICB9CiAgICB9LAogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogNSwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogZmFsc2UsCiAgICAgICAgInByZWNpc2lvbiI6IC0xCiAgICAgIH0KICAgIH0KICBdCn0=\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0,2,0,2,0,2],"DIGESTS":["SearchEngineID",0,"AdvEngineID",0,"Referer",""]}}},{"field":"URL"}],"size":1010,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q41.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q41.yaml
index 9bb4ac10e86..8c8a2359f51 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q41.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q41.yaml
@@ -11,4 +11,4 @@ calcite:
   physical: |
     EnumerableLimit(fetch=[10000])
       EnumerableLimit(offset=[100], fetch=[10])
-        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, RefererHash, TraficSourceID, URLHash, IsRefresh, CounterID], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), SEARCH($2, Sarg[-1, 6]), =($1, 3594120000172545465)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},PageViews=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[PageViews, URLHash, EventDate]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"terms":{"TraficSourceID":[-1.0,6.0],"boost":1.0}},{"term":{"RefererHash":{"value":3594120000172545465,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","RefererHash","TraficSourceID","URLHash","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URLHash|EventDate":{"multi_terms":{"terms":[{"field":"URLHash"},{"field":"EventDate","value_type":"long"}],"size":110,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, RefererHash, TraficSourceID, URLHash, IsRefresh, CounterID], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), SEARCH($2, Sarg[-1, 6]), =($1, 3594120000172545465)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},PageViews=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[PageViews, URLHash, EventDate]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"terms":{"TraficSourceID":[-1.0,6.0],"boost":1.0}},{"term":{"RefererHash":{"value":3594120000172545465,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","RefererHash","TraficSourceID","URLHash","IsRefresh","CounterID"],"excludes":[]},"aggregations":{"URLHash|EventDate":{"multi_terms":{"terms":[{"field":"URLHash"},{"field":"EventDate","value_type":"long"}],"size":110,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q42.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q42.yaml
index 9f785bf7cc9..2f5e72fc1a0 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q42.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q42.yaml
@@ -11,4 +11,4 @@ calcite:
   physical: |
     EnumerableLimit(fetch=[10000])
       EnumerableLimit(offset=[10000], fetch=[10])
-        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URLHash, DontCountHits, WindowClientHeight, IsRefresh, CounterID, WindowClientWidth], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), =($2, 0), =($1, 2868770270353813622)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},PageViews=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[PageViews, WindowClientWidth, WindowClientHeight]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"URLHash":{"value":2868770270353813622,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URLHash","DontCountHits","WindowClientHeight","IsRefresh","CounterID","WindowClientWidth"],"excludes":[]},"aggregations":{"WindowClientWidth|WindowClientHeight":{"multi_terms":{"terms":[{"field":"WindowClientWidth"},{"field":"WindowClientHeight"}],"size":10000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"PageViews":"desc"},{"_key":"asc"}]},"aggregations":{"PageViews":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+        CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[PROJECT->[EventDate, URLHash, DontCountHits, WindowClientHeight, IsRefresh, CounterID, WindowClientWidth], FILTER->AND(=($5, 62), SEARCH($0, Sarg[['2013-07-01 00:00:00':VARCHAR..'2013-07-31 00:00:00':VARCHAR]]:VARCHAR), =($4, 0), =($2, 0), =($1, 2868770270353813622)), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},PageViews=COUNT()), SORT_AGG_METRICS->[2 DESC LAST], PROJECT->[PageViews, WindowClientWidth, WindowClientHeight]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"term":{"CounterID":{"value":62,"boost":1.0}}},{"range":{"EventDate":{"from":"2013-07-01T00:00:00.000Z","to":"2013-07-31T00:00:00.000Z","include_lower":true,"include_upper":true,"format":"date_time","boost":1.0}}},{"term":{"IsRefresh":{"value":0,"boost":1.0}}},{"term":{"DontCountHits":{"value":0,"boost":1.0}}},{"term":{"URLHash":{"value":2868770270353813622,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"_source":{"includes":["EventDate","URLHash","DontCountHits","WindowClientHeight","IsRefresh","CounterID","WindowClientWidth"],"excludes":[]},"aggregations":{"WindowClientWidth|WindowClientHeight":{"multi_terms":{"terms":[{"field":"WindowClientWidth"},{"field":"WindowClientHeight"}],"size":10000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q8.yaml b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q8.yaml
index f57500d3809..8ebc6067a0a 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q8.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/clickbench/q8.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalFilter(condition=[<>($19, 0)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, hits]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER-><>($19, 0), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[count(), AdvEngineID], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"AdvEngineID","boost":1.0}}],"must_not":[{"term":{"AdvEngineID":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggregations":{"AdvEngineID":{"terms":{"field":"AdvEngineID","size":10000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"desc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, hits]], PushDownContext=[[FILTER-><>($19, 0), AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[count(), AdvEngineID], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","query":{"bool":{"must":[{"exists":{"field":"AdvEngineID","boost":1.0}}],"must_not":[{"term":{"AdvEngineID":{"value":0,"boost":1.0}}}],"adjust_pure_negative":true,"boost":1.0}},"aggregations":{"AdvEngineID":{"terms":{"field":"AdvEngineID","size":10000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"desc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure1.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure1.yaml
index b837e4968d4..75389120405 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure1.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure1.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[IS NOT NULL($7)])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 ASC FIRST], PROJECT->[count(), state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"state":{"terms":{"field":"state.keyword","size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"asc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 ASC FIRST], PROJECT->[count(), state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"state":{"terms":{"field":"state.keyword","size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"asc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure3.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure3.yaml
index 44393bfce83..e60bbe90fdc 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure3.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure3.yaml
@@ -9,4 +9,4 @@ calcite:
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]])
   physical: |
     EnumerableLimit(fetch=[10000])
-      CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},cnt=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[cnt, span(birthdate,1d)]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"span(birthdate,1d)":{"date_histogram":{"field":"birthdate","fixed_interval":"1d","offset":0,"order":[{"cnt":"desc"},{"_key":"asc"}],"keyed":false,"min_doc_count":0},"aggregations":{"cnt":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+      CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},cnt=COUNT()), SORT_AGG_METRICS->[1 DESC LAST], PROJECT->[cnt, span(birthdate,1d)]], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"span(birthdate,1d)":{"date_histogram":{"field":"birthdate","fixed_interval":"1d","offset":0,"order":[{"_count":"desc"},{"_key":"asc"}],"keyed":false,"min_doc_count":0}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms.yaml
index 6bde95ecf0c..4caf7759fc6 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms.yaml
@@ -8,4 +8,4 @@ calcite:
               LogicalFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($7))])
                 CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 ASC FIRST], PROJECT->[count(), gender, state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"gender|state":{"multi_terms":{"terms":[{"field":"gender.keyword"},{"field":"state.keyword"}],"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"asc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
+    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 ASC FIRST], PROJECT->[count(), gender, state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"gender|state":{"multi_terms":{"terms":[{"field":"gender.keyword"},{"field":"state.keyword"}],"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"asc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms_script.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms_script.yaml
index ddbe8b2764e..13d8350c11f 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms_script.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_multi_terms_script.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], new_gender=[LOWER($4)], new_state=[LOWER($7)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 ASC FIRST], PROJECT->[count(), new_gender, new_state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"new_gender|new_state":{"multi_terms":{"terms":[{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["gender.keyword"]}}},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["state.keyword"]}}}],"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"asc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0, 1},count()=COUNT()), SORT_AGG_METRICS->[2 ASC FIRST], PROJECT->[count(), new_gender, new_state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"new_gender|new_state":{"multi_terms":{"terms":[{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["gender.keyword"]}}},{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["state.keyword"]}}}],"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"asc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_script.yaml b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_script.yaml
index 9292b81e5be..7e010cba2ad 100644
--- a/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_script.yaml
+++ b/integ-test/src/test/resources/expectedOutput/calcite/explain_agg_sort_on_measure_script.yaml
@@ -9,4 +9,4 @@ calcite:
                 LogicalProject(account_number=[$0], firstname=[$1], address=[$2], balance=[$3], gender=[$4], city=[$5], employer=[$6], state=[$7], age=[$8], email=[$9], lastname=[$10], _id=[$11], _index=[$12], _score=[$13], _maxscore=[$14], _sort=[$15], _routing=[$16], new_state=[LOWER($7)])
                   CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]])
   physical: |
-    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 ASC FIRST], PROJECT->[count(), new_state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"new_state":{"terms":{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["state.keyword"]}},"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"count()":"asc"},{"_key":"asc"}]},"aggregations":{"count()":{"value_count":{"field":"_index"}}}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
+    CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_account]], PushDownContext=[[AGGREGATION->rel#:LogicalAggregate.NONE.[](input=RelSubset#,group={0},count()=COUNT()), SORT_AGG_METRICS->[1 ASC FIRST], PROJECT->[count(), new_state], LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"new_state":{"terms":{"script":{"source":"{\"langType\":\"calcite\",\"script\":\"rO0ABXQA/HsKICAib3AiOiB7CiAgICAibmFtZSI6ICJMT1dFUiIsCiAgICAia2luZCI6ICJPVEhFUl9GVU5DVElPTiIsCiAgICAic3ludGF4IjogIkZVTkNUSU9OIgogIH0sCiAgIm9wZXJhbmRzIjogWwogICAgewogICAgICAiZHluYW1pY1BhcmFtIjogMCwKICAgICAgInR5cGUiOiB7CiAgICAgICAgInR5cGUiOiAiVkFSQ0hBUiIsCiAgICAgICAgIm51bGxhYmxlIjogdHJ1ZSwKICAgICAgICAicHJlY2lzaW9uIjogLTEKICAgICAgfQogICAgfQogIF0KfQ==\"}","lang":"opensearch_compounded_script","params":{"utcTimestamp": 0,"SOURCES":[0],"DIGESTS":["state.keyword"]}},"size":1000,"min_doc_count":1,"shard_min_doc_count":0,"show_term_doc_count_error":false,"order":[{"_count":"asc"},{"_key":"asc"}]}}}}, requestedTotalSize=2147483647, pageSize=null, startFrom=0)])
\ No newline at end of file
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/asc_sort_timestamp_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_timestamp_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/asc_sort_with_after_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_with_after_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/asc_sort_with_after_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/asc_sort_with_after_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_high.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_high.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_high.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_high.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_high_2.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_high_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_high_2.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_high_2.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_low.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_low.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/cardinality_agg_low.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/cardinality_agg_low.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/composite_date_histogram_daily.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/composite_date_histogram_daily.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/composite_date_histogram_daily.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/composite_date_histogram_daily.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/composite_terms.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/composite_terms.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/composite_terms.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/composite_terms.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/composite_terms_keyword.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/composite_terms_keyword.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/composite_terms_keyword.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/composite_terms_keyword.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/date_histogram_hourly_agg.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/date_histogram_hourly_agg.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/date_histogram_hourly_agg.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/date_histogram_hourly_agg.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/date_histogram_minute_agg.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/date_histogram_minute_agg.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/date_histogram_minute_agg.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/date_histogram_minute_agg.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/default.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/default.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/default.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/default.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/desc_sort_timestamp_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_timestamp_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/desc_sort_with_after_timestamp.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_with_after_timestamp.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/desc_sort_with_after_timestamp.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/desc_sort_with_after_timestamp.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/keyword_in_range.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_in_range.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/keyword_in_range.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_in_range.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/keyword_terms.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_terms.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/keyword_terms.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_terms.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/keyword_terms_low_cardinality.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_terms_low_cardinality.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/keyword_terms_low_cardinality.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/keyword_terms_low_cardinality.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/multi_terms_keyword.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/multi_terms_keyword.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/multi_terms_keyword.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/multi_terms_keyword.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message_filtered.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message_filtered.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message_filtered.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message_filtered.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message_filtered_sorted_num.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message_filtered_sorted_num.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/query_string_on_message_filtered_sorted_num.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/query_string_on_message_filtered_sorted_num.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_agg_1.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_agg_1.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_agg_1.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_agg_1.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_agg_2.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_agg_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_agg_2.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_agg_2.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_auto_date_histo.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_auto_date_histo.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_auto_date_histo.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_auto_date_histo.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_auto_date_histo_with_metrics.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_auto_date_histo_with_metrics.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_auto_date_histo_with_metrics.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_auto_date_histo_with_metrics.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_big_range_big_term_query.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_big_range_big_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_big_range_big_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_big_range_big_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_small_range_big_term_query.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_small_range_big_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_small_range_big_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_small_range_big_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_small_range_small_term_query.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_small_range_small_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_field_conjunction_small_range_small_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_conjunction_small_range_small_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_field_disjunction_big_range_small_term_query.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_disjunction_big_range_small_term_query.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_field_disjunction_big_range_small_term_query.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_field_disjunction_big_range_small_term_query.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_numeric.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_numeric.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_numeric.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_numeric.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_with_asc_sort.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_with_asc_sort.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_with_asc_sort.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_with_asc_sort.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/range_with_desc_sort.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/range_with_desc_sort.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/range_with_desc_sort.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/range_with_desc_sort.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/scroll.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/scroll.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/scroll.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/scroll.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_keyword_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_keyword_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_keyword_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_keyword_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_keyword_no_can_match_shortcut.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_keyword_no_can_match_shortcut.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_keyword_no_can_match_shortcut.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_keyword_no_can_match_shortcut.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_asc.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_asc.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_asc.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_asc.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_asc_with_match.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_asc_with_match.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_asc_with_match.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_asc_with_match.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_desc.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_desc.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_desc.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_desc.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_desc_with_match.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_desc_with_match.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/sort_numeric_desc_with_match.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/sort_numeric_desc_with_match.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/term.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/term.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/term.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/term.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/terms_significant_1.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/terms_significant_1.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/terms_significant_1.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/terms_significant_1.yaml
diff --git a/integ-test/src/test/resources/expectedOutput/ppl/terms_significant_2.yaml b/integ-test/src/test/resources/expectedOutput/ppl/big5/terms_significant_2.yaml
similarity index 100%
rename from integ-test/src/test/resources/expectedOutput/ppl/terms_significant_2.yaml
rename to integ-test/src/test/resources/expectedOutput/ppl/big5/terms_significant_2.yaml
diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/AggPushDownAction.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/AggPushDownAction.java
index d26027cf471..5d96caff9f9 100644
--- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/AggPushDownAction.java
+++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/AggPushDownAction.java
@@ -111,11 +111,12 @@ public void rePushDownSortAggMeasure(
       List<RelFieldCollation> collations, List<String> fieldNames) {
     if (builderAndParser.getLeft().isEmpty()) return;
     if (builderAndParser.getLeft().getFirst() instanceof CompositeAggregationBuilder composite) {
+      boolean asc = collations.get(0).getDirection() == RelFieldCollation.Direction.ASCENDING;
       String path = getAggregationPath(collations, fieldNames, composite);
       BucketOrder bucketOrder =
-          collations.get(0).getDirection() == RelFieldCollation.Direction.ASCENDING
-              ? BucketOrder.aggregation(path, true)
-              : BucketOrder.aggregation(path, false);
+          composite.getSubAggregations().isEmpty()
+              ? BucketOrder.count(asc)
+              : BucketOrder.aggregation(path, asc);
       AggregationBuilder aggregationBuilder = null;
       if (composite.sources().size() == 1) {
         if (composite.sources().get(0) instanceof TermsValuesSourceBuilder terms
@@ -310,17 +311,15 @@ private AggregationBuilder attachSubAggregations(
       Collection<AggregationBuilder> subAggregations,
       String path,
       AggregationBuilder aggregationBuilder) {
-    AggregatorFactories.Builder metricBuilder = new AggregatorFactories.Builder();
-    if (subAggregations.isEmpty()) {
-      metricBuilder.addAggregator(AggregationBuilders.count(path).field("_index"));
-    } else {
+    if (!subAggregations.isEmpty()) {
+      AggregatorFactories.Builder metricBuilder = new AggregatorFactories.Builder();
       subAggregations.forEach(metricBuilder::addAggregator);
       // the count aggregator may be eliminated by doc_count optimization, add it back
       if (subAggregations.stream().noneMatch(sub -> sub.getName().equals(path))) {
         metricBuilder.addAggregator(AggregationBuilders.count(path).field("_index"));
       }
+      aggregationBuilder.subAggregations(metricBuilder);
     }
-    aggregationBuilder.subAggregations(metricBuilder);
     return aggregationBuilder;
   }