diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index aabde03f9bd2..75aef04bb092 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -6587,9 +6587,9 @@
       }
     },
     "@superset-ui/control-utils": {
-      "version": "0.13.12",
-      "resolved": "https://registry.npmjs.org/@superset-ui/control-utils/-/control-utils-0.13.12.tgz",
-      "integrity": "sha512-fxl9lWITCuvZjb2lTPE7X6WA01dM1BInnKktUForK7HP09K+oSaiInRdwZSVC5P9cH7xNlcbkPPh/AOC+Hk/Hg==",
+      "version": "0.13.21",
+      "resolved": "https://registry.npmjs.org/@superset-ui/control-utils/-/control-utils-0.13.21.tgz",
+      "integrity": "sha512-KEDSkArY9/hTVW3wdmefbVxUdQNtOyjU3EJiJZ8zeGUZAn517MmEck9AWwKAL/UsOzccU5tq5HVwZ/eSSsmLqQ==",
       "requires": {
         "@types/react-bootstrap": "0.32.21",
         "lodash": "^4.17.15",
@@ -6994,9 +6994,9 @@
       }
     },
     "@superset-ui/plugin-chart-word-cloud": {
-      "version": "0.13.9",
-      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.13.9.tgz",
-      "integrity": "sha512-2tUfQgXtzDETI7Gw4wSBDs+FnlrOkaKF4cpVqX2G/IuCc+h8UxuMbLKIp4NAMgeJ8mDbeEL+lKgnl+RDobks9w==",
+      "version": "0.13.21",
+      "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.13.21.tgz",
+      "integrity": "sha512-Y+n8jV4Nts0+qqo7qj4SjN+t4T4yAUAn8nHX1CqWnlYnVyBQfFTj3pflSQrT3Nv+jCEtbumdzFs+0tjY352gww==",
       "requires": {
         "@types/d3-cloud": "^1.2.1",
         "@types/d3-scale": "^2.0.2",
@@ -7162,9 +7162,9 @@
       }
     },
     "@superset-ui/query": {
-      "version": "0.13.6",
-      "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.13.6.tgz",
-      "integrity": "sha512-wJvqXuzv9vJNxDPKNAaHzCCly7LF8UP9AQ1zdoA88QcfYJqCzNvbt3j8XSR4nABrvNVZHnsn67wQNG4HS/IPpQ=="
+      "version": "0.13.21",
+      "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.13.21.tgz",
+      "integrity": "sha512-cD4o7ChFBS/9k2joYKdxqXBIyV2ZlrFVAmitNk1U4tAUE1zaipofNhZ2imV1Q3H8p8c3Fgk8QiqYOSbpyXiuQQ=="
     },
     "@superset-ui/style": {
       "version": "0.13.11",
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index 713e6182f0a2..8f4af8487a29 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -63,7 +63,7 @@
     "@superset-ui/chart-composition": "^0.13.5",
     "@superset-ui/color": "^0.13.3",
     "@superset-ui/connection": "^0.13.5",
-    "@superset-ui/control-utils": "^0.13.12",
+    "@superset-ui/control-utils": "^0.13.21",
     "@superset-ui/core": "^0.13.5",
     "@superset-ui/dimension": "^0.13.3",
     "@superset-ui/legacy-plugin-chart-calendar": "^0.13.6",
@@ -91,9 +91,9 @@
     "@superset-ui/legacy-preset-chart-deckgl": "^0.2.3",
     "@superset-ui/legacy-preset-chart-nvd3": "^0.13.13",
     "@superset-ui/number-format": "^0.13.3",
-    "@superset-ui/plugin-chart-word-cloud": "^0.13.9",
+    "@superset-ui/plugin-chart-word-cloud": "^0.13.21",
     "@superset-ui/preset-chart-xy": "^0.13.11",
-    "@superset-ui/query": "^0.13.6",
+    "@superset-ui/query": "^0.13.21",
     "@superset-ui/style": "^0.13.11",
     "@superset-ui/time-format": "^0.13.15",
     "@superset-ui/translation": "^0.13.3",
diff --git a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
index be5dfcc3738f..00e252e106cc 100644
--- a/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
+++ b/superset-frontend/spec/javascripts/explore/controlUtils_spec.jsx
@@ -109,7 +109,7 @@ describe('controlUtils', () => {
                   name: 'all_columns',
                   config: {
                     type: 'SelectControl',
-                    controlGroup: 'columns',
+                    queryField: 'columns',
                     multi: true,
                     label: t('Columns'),
                     default: [],
@@ -250,11 +250,11 @@ describe('controlUtils', () => {
     });
   });
 
-  describe('controlGroup', () => {
+  describe('queryFields', () => {
     it('in formData', () => {
       const controlsState = getAllControlsState('table', 'table', {}, {});
       const formData = getFormDataFromControls(controlsState);
-      expect(formData.controlGroups).toEqual({ all_columns: 'columns' });
+      expect(formData.queryFields).toEqual({ all_columns: 'columns' });
     });
   });
 });
diff --git a/superset-frontend/src/explore/controlUtils.js b/superset-frontend/src/explore/controlUtils.js
index 0dd2090c86c4..a5140bf5e747 100644
--- a/superset-frontend/src/explore/controlUtils.js
+++ b/superset-frontend/src/explore/controlUtils.js
@@ -22,12 +22,12 @@ import * as SECTIONS from './controlPanels/sections';
 
 export function getFormDataFromControls(controlsState) {
   const formData = {};
-  formData.controlGroups = {};
+  formData.queryFields = {};
   Object.keys(controlsState).forEach(controlName => {
     const control = controlsState[controlName];
     formData[controlName] = control.value;
-    if (control.hasOwnProperty('controlGroup')) {
-      formData.controlGroups[controlName] = control.controlGroup;
+    if (control.hasOwnProperty('queryField')) {
+      formData.queryFields[controlName] = control.queryField;
     }
   });
   return formData;
diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx
index acdc66b2297d..ce7a01dbf7c3 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -125,7 +125,7 @@ const timeColumnOption = {
 
 const groupByControl = {
   type: 'SelectControl',
-  controlGroup: 'groupby',
+  queryField: 'groupby',
   multi: true,
   freeForm: true,
   label: t('Group by'),
@@ -157,7 +157,7 @@ const groupByControl = {
 
 const metrics = {
   type: 'MetricsControl',
-  controlGroup: 'metrics',
+  queryField: 'metrics',
   multi: true,
   label: t('Metrics'),
   validators: [validateNonEmpty],