diff --git a/dist/oe12/Spark.pl b/dist/oe12/Spark.pl
index f6bfeeb9..26337a99 100644
Binary files a/dist/oe12/Spark.pl and b/dist/oe12/Spark.pl differ
diff --git a/src/Spark/Core/Service/SparkEntity.cls b/src/Spark/Core/Service/SparkEntity.cls
index 4ec29047..1279b281 100644
--- a/src/Spark/Core/Service/SparkEntity.cls
+++ b/src/Spark/Core/Service/SparkEntity.cls
@@ -466,10 +466,9 @@ class Spark.Core.Service.SparkEntity inherits OpenEdge.BusinessLogic.BusinessEnt
 
         /* Use the query builder to convert the request object into a valid "where" phrases. */
         assign oQueryBuilder = new QueryBuilder().
-        &if integer(entry(1, proversion, ".")) eq 11 or (integer(entry(1, proversion, ".")) ge 12 and integer(entry(2, proversion, ".")) lt 4) &then
+
         /* Needs to be called once prior to filling the where-string on each data source. */
         assign cQueryString = oQueryBuilder:BuildQueryString(poRequest, ProDataSet).
-        &endif
 
         /* Prepare to fill Dataset via where phrase from the table request. */
         extent(hDBBuffer) = extent(ProDataSource).
@@ -485,6 +484,8 @@ class Spark.Core.Service.SparkEntity inherits OpenEdge.BusinessLogic.BusinessEnt
                     ProDataSource[ix]:fill-where-string = poRequest:TableRequests[ix]:QueryString.
                 else if cQueryString begins "each" and cQueryString matches "*where*" then
                     ProDataSource[ix]:fill-where-string = substring(cQueryString, index(cQueryString, "where")).
+                else
+                    ProDataSource[ix]:fill-where-string = cQueryString.
                 &else
                 /**
                  * Newer method, which more intelligently builds a query string for the given table request and buffer.
diff --git a/src/Spark/version.i b/src/Spark/version.i
index 31114dd9..947e00b7 100644
--- a/src/Spark/version.i
+++ b/src/Spark/version.i
@@ -1 +1 @@
-&GLOBAL-DEFINE SPARK_VERSION 5.1.0-2020.10.12.064120 (12.2.0)
\ No newline at end of file
+&GLOBAL-DEFINE SPARK_VERSION 5.1.0-2020.10.12.085259 (12.2.0)
\ No newline at end of file