diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..9bd5d26
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..b2652b8
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..09d1f68
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..fd38e17
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..24ffcbf
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..dbec3d7
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..bb26607
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..354d011
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..9242852
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/ford/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..9bd5d26
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..b2652b8
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..09d1f68
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..fd38e17
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..24ffcbf
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..dbec3d7
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..bb26607
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..354d011
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..9242852
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/lexus/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..9bd5d26
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 1, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..b2652b8
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 1, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..09d1f68
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/1/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 1, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..fd38e17
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 2, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..24ffcbf
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 2, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..dbec3d7
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/2/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 2, "year": 2003, "month": 3, "day": 3}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
new file mode 100644
index 0000000..bb26607
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2001-month-01-day-01-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
+{"customer_id": 3, "year": 2001, "month": 1, "day": 1}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
new file mode 100644
index 0000000..354d011
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2002-month-02-day-02-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
+{"customer_id": 3, "year": 2002, "month": 2, "day": 2}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
new file mode 100644
index 0000000..9242852
--- /dev/null
+++ b/asterixdb/asterix-app/data/json/external-filter/embed/car/toyota/customer/3/maintenance-report/year-2003-month-03-day-03-date/0.json
@@ -0,0 +1,3 @@
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "year": 2003, "month": 3, "day": 3}
+{"customer_id": 3, "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/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.000.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.000.ddl.sqlpp
new file mode 100644
index 0000000..01935c0
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.000.ddl.sqlpp
@@ -0,0 +1,33 @@
+/*
+ * 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 maintenance(test) USING %adapter% (
+    %template%,
+    ("container"="playground"),
+    ("definition"="external-filter/embed/car/{company:string}/customer/{customer_id:int}/maintenance-report/year-{year:int}-month-{month:int}-day-{day:int}-date"),
+    ("embed-filter-values" = "true"),
+    ("format"="json")
+);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.query.sqlpp
new file mode 100644
index 0000000..2907baa
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.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.
+ */
+
+USE test;
+
+SELECT value t
+FROM maintenance t
+ORDER BY t.customer_id,
+         t.company,
+         t.year,
+         t.month,
+         t.day
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.query.sqlpp
new file mode 100644
index 0000000..3c99576
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.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.
+ */
+
+USE test;
+
+SELECT VALUE t
+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/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.adm
new file mode 100644
index 0000000..1fcdcfa
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.001.adm
@@ -0,0 +1,81 @@
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 1, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 1, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 2, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 2, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 2, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "ford" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "ford" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "lexus" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "lexus" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "lexus" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 3, "year": 2001, "month": 1, "day": 1, "company": "toyota" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 3, "year": 2002, "month": 2, "day": 2, "company": "toyota" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
+{ "customer_id": 3, "year": 2003, "month": 3, "day": 3, "company": "toyota" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.adm
new file mode 100644
index 0000000..eff14d1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/dynamic-prefixes/embed-multiple-values/embed-multiple-values.002.adm
@@ -0,0 +1,3 @@
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
+{ "customer_id": 1, "year": 2001, "month": 1, "day": 1, "company": "ford" }
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 1b553d3..132a905 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
@@ -250,6 +250,12 @@
         <output-dir compare="Text">embed-one-value</output-dir>
       </compilation-unit>
     </test-case>
+    <test-case FilePath="external-dataset/common/dynamic-prefixes">
+      <compilation-unit name="embed-multiple-values">
+        <placeholder name="adapter" value="S3" />
+        <output-dir compare="Text">embed-multiple-values</output-dir>
+      </compilation-unit>
+    </test-case>
     <test-case FilePath="external-dataset/common/dynamic-prefixes/parquet">
       <compilation-unit name="one-field">
         <placeholder name="adapter" value="S3" />
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/filter/ExternalFilterValueEvaluator.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/filter/ExternalFilterValueEvaluator.java
index ec5b3e6..acf1d61 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/filter/ExternalFilterValueEvaluator.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/input/filter/ExternalFilterValueEvaluator.java
@@ -69,10 +69,13 @@
             case INTEGER:
             case BIGINT:
                 Integer64SerializerDeserializer.write(Long.parseLong(stringValue), output);
+                break;
             case DOUBLE:
                 DoubleSerializerDeserializer.write(Double.parseDouble(stringValue), output);
+                break;
             case STRING:
                 stringSerDer.serialize(stringValue, output);
+                break;
         }
     }
 }