diff --git a/dist/charting.js b/dist/charting.js
index 5f231eb6..97af9d18 100644
--- a/dist/charting.js
+++ b/dist/charting.js
@@ -32565,11 +32565,6 @@ function rasterLayerPointMixin(_layer) {
   var state = null;
   _layer.colorDomain = Object(__WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__["c" /* createRasterLayerGetterSetter */])(_layer, null);
   _layer.sizeDomain = Object(__WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__["c" /* createRasterLayerGetterSetter */])(_layer, null);
-
-  /** 
-   * If provided, this query will be used in the vega spec instead of being generated from
-   */
-  _layer.queryOverride = Object(__WEBPACK_IMPORTED_MODULE_1__utils_utils_vega__["c" /* createRasterLayerGetterSetter */])(_layer, null);
   _layer.setState = function (setter) {
     if (typeof setter === "function") {
       state = setter(state);
@@ -32817,8 +32812,7 @@ function rasterLayerPointMixin(_layer) {
       lastFilteredSize = _ref2.lastFilteredSize,
       globalFilter = _ref2.globalFilter,
       pixelRatio = _ref2.pixelRatio,
-      layerName = _ref2.layerName,
-      queryOverride = _ref2.queryOverride;
+      layerName = _ref2.layerName;
     var autocolors = usesAutoColors();
     var autosize = usesAutoSize();
     var getStatsLayerName = function getStatsLayerName() {
@@ -32829,35 +32823,36 @@ function rasterLayerPointMixin(_layer) {
     var data = [];
     if (state.encoding.color.prioritizedColor && state.encoding.color.prioritizedColor.length > 0 && layerName !== "backendScatter") {
       for (var i = 0; i < state.encoding.color.prioritizedColor.length; i++) {
-        var transform = _layer.getTransforms(table, filter + " AND ".concat(state.encoding.color.field, " = '").concat(state.encoding.color.prioritizedColor[i].value, "'"), globalFilter, state, lastFilteredSize);
-        var sql = __WEBPACK_IMPORTED_MODULE_2__utils_utils__["i" /* parser */].writeSQL({
-          type: "root",
-          source: table,
-          transform: transform
-        });
         if (layerName.includes("_z".concat(i * 2))) {
           data = [{
             name: layerName,
-            sql: queryOverride || sql,
+            sql: __WEBPACK_IMPORTED_MODULE_2__utils_utils__["i" /* parser */].writeSQL({
+              type: "root",
+              source: table,
+              transform: _layer.getTransforms(table, filter + " AND ".concat(state.encoding.color.field, " != '").concat(state.encoding.color.prioritizedColor[i].value, "'"), globalFilter, state, lastFilteredSize)
+            }),
             enableHitTesting: state.enableHitTesting
           }];
         } else if (layerName.includes("_z".concat(i * 2 + 1))) {
           data = [{
             name: layerName,
-            sql: queryOverride || sql,
+            sql: __WEBPACK_IMPORTED_MODULE_2__utils_utils__["i" /* parser */].writeSQL({
+              type: "root",
+              source: table,
+              transform: _layer.getTransforms(table, filter + " AND ".concat(state.encoding.color.field, " = '").concat(state.encoding.color.prioritizedColor[i].value, "'"), globalFilter, state, lastFilteredSize)
+            }),
             enableHitTesting: state.enableHitTesting
           }];
         }
       }
     } else {
-      var _sql = __WEBPACK_IMPORTED_MODULE_2__utils_utils__["i" /* parser */].writeSQL({
-        type: "root",
-        source: table,
-        transform: _layer.getTransforms(table, filter, globalFilter, state, lastFilteredSize)
-      });
       data = [{
         name: layerName,
-        sql: queryOverride || _sql,
+        sql: __WEBPACK_IMPORTED_MODULE_2__utils_utils__["i" /* parser */].writeSQL({
+          type: "root",
+          source: table,
+          transform: _layer.getTransforms(table, filter, globalFilter, state, lastFilteredSize)
+        }),
         enableHitTesting: state.enableHitTesting
       }];
     }
@@ -32985,8 +32980,7 @@ function rasterLayerPointMixin(_layer) {
       filter: _layer.crossfilter().getFilterString(realLayerName),
       globalFilter: _layer.crossfilter().getGlobalFilterString(),
       lastFilteredSize: Object(__WEBPACK_IMPORTED_MODULE_0__core_core_async__["g" /* lastFilteredSize */])(_layer.crossfilter().getId()),
-      pixelRatio: chart._getPixelRatio(),
-      queryOverride: _layer.queryOverride()
+      pixelRatio: chart._getPixelRatio()
     });
     return _vega;
   };
diff --git a/src/mixins/raster-layer-point-mixin.js b/src/mixins/raster-layer-point-mixin.js
index f228b1bc..ee5a6772 100644
--- a/src/mixins/raster-layer-point-mixin.js
+++ b/src/mixins/raster-layer-point-mixin.js
@@ -169,11 +169,6 @@ export default function rasterLayerPointMixin(_layer) {
   _layer.colorDomain = createRasterLayerGetterSetter(_layer, null)
   _layer.sizeDomain = createRasterLayerGetterSetter(_layer, null)
 
-  /** 
-   * If provided, this query will be used in the vega spec instead of being generated from
-   */ 
-  _layer.queryOverride = createRasterLayerGetterSetter(_layer, null)
-
   _layer.setState = function(setter) {
     if (typeof setter === "function") {
       state = setter(state)
@@ -466,8 +461,7 @@ export default function rasterLayerPointMixin(_layer) {
     lastFilteredSize,
     globalFilter,
     pixelRatio,
-    layerName,
-    queryOverride
+    layerName
   }) {
     const autocolors = usesAutoColors()
     const autosize = usesAutoSize()
@@ -492,24 +486,22 @@ export default function rasterLayerPointMixin(_layer) {
       layerName !== "backendScatter"
     ) {
       for (let i = 0; i < state.encoding.color.prioritizedColor.length; i++) {
-        const transform = _layer.getTransforms(
-          table,
-          filter +
-            ` AND ${state.encoding.color.field} = '${state.encoding.color.prioritizedColor[i].value}'`,
-          globalFilter,
-          state,
-          lastFilteredSize
-        )
-        const sql = parser.writeSQL({
-          type: "root",
-          source: table,
-          transform
-        })
         if (layerName.includes(`_z${i * 2}`)) {
           data = [
             {
               name: layerName,
-              sql: queryOverride || sql,
+              sql: parser.writeSQL({
+                type: "root",
+                source: table,
+                transform: _layer.getTransforms(
+                  table,
+                  filter +
+                    ` AND ${state.encoding.color.field} != '${state.encoding.color.prioritizedColor[i].value}'`,
+                  globalFilter,
+                  state,
+                  lastFilteredSize
+                )
+              }),
               enableHitTesting: state.enableHitTesting
             }
           ]
@@ -517,28 +509,38 @@ export default function rasterLayerPointMixin(_layer) {
           data = [
             {
               name: layerName,
-              sql: queryOverride || sql,
+              sql: parser.writeSQL({
+                type: "root",
+                source: table,
+                transform: _layer.getTransforms(
+                  table,
+                  filter +
+                    ` AND ${state.encoding.color.field} = '${state.encoding.color.prioritizedColor[i].value}'`,
+                  globalFilter,
+                  state,
+                  lastFilteredSize
+                )
+              }),
               enableHitTesting: state.enableHitTesting
             }
           ]
         }
       }
     } else {
-      const sql = parser.writeSQL({
-        type: "root",
-        source: table,
-        transform: _layer.getTransforms(
-          table,
-          filter,
-          globalFilter,
-          state,
-          lastFilteredSize
-        )
-      })
       data = [
         {
           name: layerName,
-          sql: queryOverride || sql,
+          sql: parser.writeSQL({
+            type: "root",
+            source: table,
+            transform: _layer.getTransforms(
+              table,
+              filter,
+              globalFilter,
+              state,
+              lastFilteredSize
+            )
+          }),
           enableHitTesting: state.enableHitTesting
         }
       ]
@@ -707,8 +709,7 @@ export default function rasterLayerPointMixin(_layer) {
       filter: _layer.crossfilter().getFilterString(realLayerName),
       globalFilter: _layer.crossfilter().getGlobalFilterString(),
       lastFilteredSize: lastFilteredSize(_layer.crossfilter().getId()),
-      pixelRatio: chart._getPixelRatio(),
-      queryOverride: _layer.queryOverride()
+      pixelRatio: chart._getPixelRatio()
     })
 
     return _vega