diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..df51393
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "ford", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..e8a0bfd
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "ford", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..422e8c4
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "ford", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..58d56aa
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "ford", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..b98d4d4
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "ford", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..29f2916
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "ford", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..52d4100
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "ford", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "ford", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..b96e7b3
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "ford", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "ford", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..741c46e
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "ford", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "ford", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..a718ed0
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "lexus", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..d9ac534
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "lexus", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..c2520ac
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "lexus", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..aa5f053
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "lexus", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..d6a07a1
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "lexus", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..7bc1d0f
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "lexus", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..c870b5e
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "lexus", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "lexus", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..325acd8
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "lexus", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "lexus", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..d1e6b0e
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "lexus", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "lexus", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..01f21f5
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "company": "toyota", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..5f5a453
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "company": "toyota", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..fabbc16
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "company": "toyota", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..3aaf2b6
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "company": "toyota", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..fefe014
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "company": "toyota", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..462bfff
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "company": "toyota", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..5503907
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "toyota", "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "company": "toyota", "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..42a5a75
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "toyota", "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "company": "toyota", "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..32a8f2e
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "toyota", "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "company": "toyota", "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp
new file mode 100644
index 0000000..e8d2a68
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.000.ddl.sqlpp
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+DROP DATAVERSE test IF EXISTS;
+CREATE DATAVERSE test;
+USE test;
+
+CREATE TYPE test AS {
+};
+
+
+CREATE EXTERNAL DATASET company(test) USING S3 (
+    ("accessKeyId"="dummyAccessKey"),
+    ("secretAccessKey"="dummySecretKey"),
+    ("region"="us-west-2"),
+    ("serviceEndpoint"="http://127.0.0.1:8001"),
+    ("container"="playground"),
+    ("definition"="external-filter/car/{company:string}"),
+    ("format"="json")
+);
+
+CREATE EXTERNAL DATASET customer(test) USING S3 (
+    ("accessKeyId"="dummyAccessKey"),
+    ("secretAccessKey"="dummySecretKey"),
+    ("region"="us-west-2"),
+    ("serviceEndpoint"="http://127.0.0.1:8001"),
+    ("container"="playground"),
+    ("definition"="external-filter/car/{company:string}/customer/{customer_id:int}"),
+    ("format"="json")
+);
+
+CREATE EXTERNAL DATASET maintenance(test) USING S3 (
+    ("accessKeyId"="dummyAccessKey"),
+    ("secretAccessKey"="dummySecretKey"),
+    ("region"="us-west-2"),
+    ("serviceEndpoint"="http://127.0.0.1:8001"),
+    ("container"="playground"),
+    ("definition"="external-filter/car/{company:string}/customer/{customer_id:int}/maintenance-report/year-{year:int}-month-{month:int}-day-{day:int}-date"),
+    ("format"="json")
+);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.010.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.010.query.sqlpp
new file mode 100644
index 0000000..603e828
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.010.query.sqlpp
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.011.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.011.query.sqlpp
new file mode 100644
index 0000000..f687312
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.011.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t
+WHERE t.company = "ford";
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.012.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.012.query.sqlpp
new file mode 100644
index 0000000..a0e5f77
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.012.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t
+WHERE t.company = "cheese";
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.013.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.013.query.sqlpp
new file mode 100644
index 0000000..b24c12d
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.013.query.sqlpp
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t
+WHERE t.company = "ford"
+  AND t.company = "toyota";
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.014.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.014.query.sqlpp
new file mode 100644
index 0000000..7d43ccc
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.014.query.sqlpp
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t
+WHERE t.company = "ford"
+  OR t.company = "toyota";
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.015.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.015.query.sqlpp
new file mode 100644
index 0000000..d5f37b2
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.015.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM company t
+WHERE t.company IN ["ford", "toyota"];
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.016.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.016.query.sqlpp
new file mode 100644
index 0000000..3bbafca
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.016.query.sqlpp
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM customer t
+WHERE t.company = "ford"
+  AND t.customer_id = 1;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.017.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.017.query.sqlpp
new file mode 100644
index 0000000..0a4c1ea
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.017.query.sqlpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM customer t
+WHERE t.customer_id = 1;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.018.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.018.query.sqlpp
new file mode 100644
index 0000000..a8fa256
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.018.query.sqlpp
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM maintenance t
+WHERE t.company = "ford"
+  AND t.customer_id = 1
+  AND t.year = 2001
+  AND t.month = 01
+  AND t.day = 01;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.019.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.019.query.sqlpp
new file mode 100644
index 0000000..6d435eb
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.019.query.sqlpp
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// param max-warnings:json=10
+
+USE test;
+
+SELECT value count(*)
+FROM maintenance t
+WHERE t.year = 2001
+  AND t.month = 01
+  AND t.day = 01;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.999.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.999.ddl.sqlpp
new file mode 100644
index 0000000..36b2bab
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/query/test.999.ddl.sqlpp
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+DROP DATAVERSE test IF EXISTS;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp
index 7b70bd3..c1caa4f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.000.ddl.sqlpp
@@ -31,6 +31,6 @@
     ("region"="us-west-2"),
     ("serviceEndpoint"="http://127.0.0.1:8001"),
     ("container"="playground"),
-    ("definition"="external-filter/{name:bigint}"),
+    ("definition"="external-filter/department/{name:bigint}"),
     ("format"="json")
 );
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp
index 13b6abe..25fefed 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/s3/filter/type-mismatch/test.010.query.sqlpp
@@ -23,4 +23,4 @@
 
 SELECT value count(*)
 FROM test t
-WHERE t.name = "department";
\ No newline at end of file
+WHERE t.name = "accounting";
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.010.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.010.adm
new file mode 100644
index 0000000..c147342
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.010.adm
@@ -0,0 +1 @@
+81
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.011.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.011.adm
new file mode 100644
index 0000000..a5c750f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.011.adm
@@ -0,0 +1 @@
+27
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.012.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.012.adm
new file mode 100644
index 0000000..c227083
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.012.adm
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.013.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.013.adm
new file mode 100644
index 0000000..c227083
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.013.adm
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.014.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.014.adm
new file mode 100644
index 0000000..43c451e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.014.adm
@@ -0,0 +1 @@
+54
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.015.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.015.adm
new file mode 100644
index 0000000..43c451e
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.015.adm
@@ -0,0 +1 @@
+54
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.016.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.016.adm
new file mode 100644
index 0000000..f11c82a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.016.adm
@@ -0,0 +1 @@
+9
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.017.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.017.adm
new file mode 100644
index 0000000..a5c750f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.017.adm
@@ -0,0 +1 @@
+27
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.018.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.018.adm
new file mode 100644
index 0000000..e440e5c
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.018.adm
@@ -0,0 +1 @@
+3
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.019.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.019.adm
new file mode 100644
index 0000000..a5c750f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/s3/filter/query/result.019.adm
@@ -0,0 +1 @@
+27
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
index cd40b1a..50502da 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_external_dataset_s3.xml
@@ -230,12 +230,14 @@
     <test-case FilePath="external-dataset/s3/filter" check-warnings="true">
       <compilation-unit name="type-mismatch">
         <output-dir compare="Text">type-mismatch</output-dir>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/accounting/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'department'. Reason: 'For input string: "department"'</expected-warn>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/engineering/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'department'. Reason: 'For input string: "department"'</expected-warn>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/hr/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'department'. Reason: 'For input string: "department"'</expected-warn>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/last-name/Jones/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'last-name'. Reason: 'For input string: "last-name"'</expected-warn>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/last-name/miller/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'last-name'. Reason: 'For input string: "last-name"'</expected-warn>
-        <expected-warn>Failed to evaluate computed field. File: 'external-filter/last-name/smith/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'last-name'. Reason: 'For input string: "last-name"'</expected-warn>
+        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/accounting/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'accounting'. Reason: 'For input string: "accounting"'</expected-warn>
+        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/engineering/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'engineering'. Reason: 'For input string: "engineering"'</expected-warn>
+        <expected-warn>Failed to evaluate computed field. File: 'external-filter/department/hr/0.json'. Computed Field Name: 'name'. Computed Field Type: 'bigint'. Computed Field Value: 'hr'. Reason: 'For input string: "hr"'</expected-warn>
+      </compilation-unit>
+    </test-case>
+    <test-case FilePath="external-dataset/s3/filter">
+      <compilation-unit name="query">
+        <output-dir compare="Text">query</output-dir>
       </compilation-unit>
     </test-case>
     <!-- Dynamic prefixes tests end -->