diff --git a/packages/cubejs-client-ngx/dist/cubejs-client-ngx.umd.js b/packages/cubejs-client-ngx/dist/cubejs-client-ngx.umd.js
index 4403b71d29bff..a82bbf05b80a1 100644
--- a/packages/cubejs-client-ngx/dist/cubejs-client-ngx.umd.js
+++ b/packages/cubejs-client-ngx/dist/cubejs-client-ngx.umd.js
@@ -43,7 +43,7 @@
 	  return store[key] || (store[key] = value !== undefined ? value : {});
 	})('versions', []).push({
 	  version: _core.version,
-	  mode: _library ? 'pure' : 'global',
+	  mode: 'global',
 	  copyright: '© 2019 Denis Pushkarev (zloirock.ru)'
 	});
 	});
@@ -614,7 +614,7 @@
 
 	var defineProperty = _objectDp.f;
 	var _wksDefine = function (name) {
-	  var $Symbol = _core.Symbol || (_core.Symbol = _library ? {} : _global.Symbol || {});
+	  var $Symbol = _core.Symbol || (_core.Symbol = _global.Symbol || {});
 	  if (name.charAt(0) != '_' && !(name in $Symbol)) defineProperty($Symbol, name, { value: _wksExt.f(name) });
 	};
 
@@ -3950,7 +3950,7 @@
 
 	function getPromiseCtor(promiseCtor) {
 	  if (!promiseCtor) {
-	    promiseCtor = Promise;
+	    promiseCtor = config.Promise || Promise;
 	  }
 
 	  if (!promiseCtor) {
@@ -10794,7 +10794,7 @@
 	 *
 	 * Use an `InjectionToken` whenever the type you are injecting is not reified (does not have a
 	 * runtime representation) such as when injecting an interface, callable type, array or
-	 * parametrized type.
+	 * parameterized type.
 	 *
 	 * `InjectionToken` is parameterized on `T` which is the type of object which will be returned by
 	 * the `Injector`. This provides additional level of type safety.
@@ -10851,15 +10851,16 @@
 	 * Use of this source code is governed by an MIT-style license that can be
 	 * found in the LICENSE file at https://angular.io/license
 	 */ /**
-	 * This token can be used to create a virtual provider that will populate the
-	 * `entryComponents` fields of components and ng modules based on its `useValue`.
+	 * A DI token that you can use to create a virtual [provider](guide/glossary#provider)
+	 * that will populate the `entryComponents` field of components and NgModules
+	 * based on its `useValue` property value.
 	 * All components that are referenced in the `useValue` value (either directly
-	 * or in a nested array or map) will be added to the `entryComponents` property.
+	 * or in a nested array or map) are added to the `entryComponents` property.
 	 *
 	 * @usageNotes
-	 * ### Example
+	 *
 	 * The following example shows how the router can populate the `entryComponents`
-	 * field of an NgModule based on the router configuration which refers
+	 * field of an NgModule based on a router configuration that refers
 	 * to components.
 	 *
 	 * ```typescript
@@ -10936,6 +10937,7 @@
 	     * Use the `CheckOnce` strategy, meaning that automatic change detection is deactivated
 	     * until reactivated by setting the strategy to `Default` (`CheckAlways`).
 	     * Change detection can still be explicitly invoked.
+	     * This strategy applies to all child directives and cannot be overridden.
 	     */ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"]=0]="OnPush";/**
 	     * Use the default `CheckAlways` strategy, in which change detection is automatic until
 	     * explicitly deactivated.
@@ -12679,7 +12681,7 @@
 	 * @publicApi
 	 */var Version=/** @class */function(){function Version(full){this.full=full;this.major=full.split('.')[0];this.minor=full.split('.')[1];this.patch=full.split('.').slice(2).join('.');}return Version;}();/**
 	 * @publicApi
-	 */var VERSION=new Version('7.2.0');/**
+	 */var VERSION=new Version('7.2.14');/**
 	 * @license
 	 * Copyright Google Inc. All Rights Reserved.
 	 *
@@ -12762,7 +12764,12 @@
 	// NB: Sanitization does not allow <form> elements or other active elements (<button> etc). Those
 	// can be sanitized, but they increase security surface area without a legitimate use case, so they
 	// are left out here.
-	var VALID_ATTRS=merge$1$1(URI_ATTRS,SRCSET_ATTRS,HTML_ATTRS);var Plural;(function(Plural){Plural[Plural["Zero"]=0]="Zero";Plural[Plural["One"]=1]="One";Plural[Plural["Two"]=2]="Two";Plural[Plural["Few"]=3]="Few";Plural[Plural["Many"]=4]="Many";Plural[Plural["Other"]=5]="Other";})(Plural||(Plural={}));/**
+	var VALID_ATTRS=merge$1$1(URI_ATTRS,SRCSET_ATTRS,HTML_ATTRS);// Elements whose content should not be traversed/preserved, if the elements themselves are invalid.
+	//
+	// Typically, `<invalid>Some content</invalid>` would traverse (and in this case preserve)
+	// `Some content`, but strip `invalid-element` opening/closing tags. For some elements, though, we
+	// don't want to preserve the content, if the elements themselves are going to be removed.
+	var SKIP_TRAVERSING_CONTENT_IF_INVALID_ELEMENTS=tagSet('script,style,template');var Plural;(function(Plural){Plural[Plural["Zero"]=0]="Zero";Plural[Plural["One"]=1]="One";Plural[Plural["Two"]=2]="Two";Plural[Plural["Few"]=3]="Few";Plural[Plural["Many"]=4]="Many";Plural[Plural["Other"]=5]="Other";})(Plural||(Plural={}));/**
 	 * @license
 	 * Copyright Google Inc. All Rights Reserved.
 	 *
@@ -12990,7 +12997,7 @@
 	 * @Annotation
 	 * @publicApi
 	 */var Pipe=makeDecorator('Pipe',function(p){return _assign({pure:true},p);},undefined,undefined,function(type,meta){return SWITCH_COMPILE_PIPE(type,meta);});var initializeBaseDef=function initializeBaseDef(target){var constructor=target.constructor;var inheritedBaseDef=constructor.ngBaseDef;var baseDef=constructor.ngBaseDef={inputs:{},outputs:{},declaredInputs:{}};if(inheritedBaseDef){fillProperties(baseDef.inputs,inheritedBaseDef.inputs);fillProperties(baseDef.outputs,inheritedBaseDef.outputs);fillProperties(baseDef.declaredInputs,inheritedBaseDef.declaredInputs);}};/**
-	 * Does the work of creating the `ngBaseDef` property for the @Input and @Output decorators.
+	 * Does the work of creating the `ngBaseDef` property for the `Input` and `Output` decorators.
 	 * @param key "inputs" or "outputs"
 	 */var updateBaseDefFromIOProp=function updateBaseDefFromIOProp(getProp){return function(target,name){var args=[];for(var _i=2;_i<arguments.length;_i++){args[_i-2]=arguments[_i];}var constructor=target.constructor;if(!constructor.hasOwnProperty(NG_BASE_DEF)){initializeBaseDef(target);}var baseDef=constructor.ngBaseDef;var defProp=getProp(baseDef);defProp[name]=args[0];};};/**
 	 * @Annotation
@@ -13886,6 +13893,94 @@
 	throw e;}}function optionsReducer(dst,objs){if(Array.isArray(objs)){dst=objs.reduce(optionsReducer,dst);}else{dst=_assign({},dst,objs);}return dst;}/**
 	 * A reference to an Angular application running on a page.
 	 *
+	 * @usageNotes
+	 *
+	 * {@a is-stable-examples}
+	 * ### isStable examples and caveats
+	 *
+	 * Note two important points about `isStable`, demonstrated in the examples below:
+	 * - the application will never be stable if you start any kind
+	 * of recurrent asynchronous task when the application starts
+	 * (for example for a polling process, started with a `setInterval`, a `setTimeout`
+	 * or using RxJS operators like `interval`);
+	 * - the `isStable` Observable runs outside of the Angular zone.
+	 *
+	 * Let's imagine that you start a recurrent task
+	 * (here incrementing a counter, using RxJS `interval`),
+	 * and at the same time subscribe to `isStable`.
+	 *
+	 * ```
+	 * constructor(appRef: ApplicationRef) {
+	 *   appRef.isStable.pipe(
+	 *      filter(stable => stable)
+	 *   ).subscribe(() => console.log('App is stable now');
+	 *   interval(1000).subscribe(counter => console.log(counter));
+	 * }
+	 * ```
+	 * In this example, `isStable` will never emit `true`,
+	 * and the trace "App is stable now" will never get logged.
+	 *
+	 * If you want to execute something when the app is stable,
+	 * you have to wait for the application to be stable
+	 * before starting your polling process.
+	 *
+	 * ```
+	 * constructor(appRef: ApplicationRef) {
+	 *   appRef.isStable.pipe(
+	 *     first(stable => stable),
+	 *     tap(stable => console.log('App is stable now')),
+	 *     switchMap(() => interval(1000))
+	 *   ).subscribe(counter => console.log(counter));
+	 * }
+	 * ```
+	 * In this example, the trace "App is stable now" will be logged
+	 * and then the counter starts incrementing every second.
+	 *
+	 * Note also that this Observable runs outside of the Angular zone,
+	 * which means that the code in the subscription
+	 * to this Observable will not trigger the change detection.
+	 *
+	 * Let's imagine that instead of logging the counter value,
+	 * you update a field of your component
+	 * and display it in its template.
+	 *
+	 * ```
+	 * constructor(appRef: ApplicationRef) {
+	 *   appRef.isStable.pipe(
+	 *     first(stable => stable),
+	 *     switchMap(() => interval(1000))
+	 *   ).subscribe(counter => this.value = counter);
+	 * }
+	 * ```
+	 * As the `isStable` Observable runs outside the zone,
+	 * the `value` field will be updated properly,
+	 * but the template will not be refreshed!
+	 *
+	 * You'll have to manually trigger the change detection to update the template.
+	 *
+	 * ```
+	 * constructor(appRef: ApplicationRef, cd: ChangeDetectorRef) {
+	 *   appRef.isStable.pipe(
+	 *     first(stable => stable),
+	 *     switchMap(() => interval(1000))
+	 *   ).subscribe(counter => {
+	 *     this.value = counter;
+	 *     cd.detectChanges();
+	 *   });
+	 * }
+	 * ```
+	 *
+	 * Or make the subscription callback run inside the zone.
+	 *
+	 * ```
+	 * constructor(appRef: ApplicationRef, zone: NgZone) {
+	 *   appRef.isStable.pipe(
+	 *     first(stable => stable),
+	 *     switchMap(() => interval(1000))
+	 *   ).subscribe(counter => zone.run(() => this.value = counter));
+	 * }
+	 * ```
+	 *
 	 * @publicApi
 	 */var ApplicationRef=/** @class */function(){/** @internal */function ApplicationRef(_zone,_console,_injector,_exceptionHandler,_componentFactoryResolver,_initStatus){var _this=this;this._zone=_zone;this._console=_console;this._injector=_injector;this._exceptionHandler=_exceptionHandler;this._componentFactoryResolver=_componentFactoryResolver;this._initStatus=_initStatus;this._bootstrapListeners=[];this._views=[];this._runningTick=false;this._enforceNoNewChanges=false;this._stable=true;/**
 	         * Get a list of component types registered to this application.
diff --git a/packages/cubejs-vue/dist/cubejs-vue.esm.js b/packages/cubejs-vue/dist/cubejs-vue.esm.js
index 84b0b4ac23115..60c8b370452a6 100644
--- a/packages/cubejs-vue/dist/cubejs-vue.esm.js
+++ b/packages/cubejs-vue/dist/cubejs-vue.esm.js
@@ -320,7 +320,9 @@ var QueryBuilder = {
       availableMeasures: [],
       availableDimensions: [],
       availableTimeDimensions: [],
-      availableSegments: []
+      availableSegments: [],
+      limit: null,
+      offset: null
     };
     data.granularities = [{
       name: 'hour',
@@ -346,7 +348,7 @@ var QueryBuilder = {
     _regeneratorRuntime.mark(function _callee() {
       var _this = this;
 
-      var _this$query, measures, dimensions, segments, timeDimensions, filters;
+      var _this$query, measures, dimensions, segments, timeDimensions, filters, limit, offset;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -357,7 +359,7 @@ var QueryBuilder = {
 
             case 2:
               this.meta = _context.sent;
-              _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters;
+              _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters, limit = _this$query.limit, offset = _this$query.offset;
               this.measures = (measures || []).map(function (m, i) {
                 return _objectSpread({
                   index: i
@@ -383,8 +385,9 @@ var QueryBuilder = {
               });
               this.filters = (filters || []).map(function (m, i) {
                 return _objectSpread({}, m, {
-                  dimension: _this.meta.resolveMember(m.dimension, ['dimensions', 'measures']),
-                  operators: _this.meta.filterOperatorsForMember(m.dimension, ['dimensions', 'measures']),
+                  // using 'dimension' is deprecated, 'member' should be specified instead
+                  member: _this.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
+                  operators: _this.meta.filterOperatorsForMember(m.member || m.dimension, ['dimensions', 'measures']),
                   index: i
                 });
               });
@@ -394,8 +397,10 @@ var QueryBuilder = {
                 return m.type === 'time';
               });
               this.availableSegments = this.meta.membersForQuery({}, 'segments') || [];
+              this.limit = limit || null;
+              this.offset = offset || null;
 
-            case 13:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -424,7 +429,13 @@ var QueryBuilder = {
         availableSegments = this.availableSegments,
         availableTimeDimensions = this.availableTimeDimensions,
         availableDimensions = this.availableDimensions,
-        availableMeasures = this.availableMeasures;
+        availableMeasures = this.availableMeasures,
+        limit = this.limit,
+        offset = this.offset,
+        setLimit = this.setLimit,
+        removeLimit = this.removeLimit,
+        setOffset = this.setOffset,
+        removeOffset = this.removeOffset;
     var builderProps = {};
 
     if (meta) {
@@ -442,7 +453,13 @@ var QueryBuilder = {
         availableTimeDimensions: availableTimeDimensions,
         availableDimensions: availableDimensions,
         availableMeasures: availableMeasures,
-        updateChartType: this.updateChart
+        updateChartType: this.updateChart,
+        limit: limit,
+        offset: offset,
+        setLimit: setLimit,
+        removeLimit: removeLimit,
+        setOffset: setOffset,
+        removeOffset: removeOffset
       };
       QUERY_ELEMENTS.forEach(function (e) {
         var name = e.charAt(0).toUpperCase() + e.slice(1);
@@ -492,10 +509,15 @@ var QueryBuilder = {
 
       var toQuery = function toQuery(member) {
         return member.name;
-      }; // TODO: implement order, limit, timezone, renewQuery
+      }; // TODO: implement order, timezone, renewQuery
 
 
+      var hasElements = false;
       QUERY_ELEMENTS.forEach(function (e) {
+        if (!_this3[e]) {
+          return;
+        }
+
         if (e === 'timeDimensions') {
           toQuery = function toQuery(member) {
             return {
@@ -507,7 +529,7 @@ var QueryBuilder = {
         } else if (e === 'filters') {
           toQuery = function toQuery(member) {
             return {
-              dimension: member.dimension.name,
+              member: member.member.name,
               operator: member.operator,
               values: member.values
             };
@@ -518,6 +540,7 @@ var QueryBuilder = {
           validatedQuery[e] = _this3[e].map(function (x) {
             return toQuery(x);
           });
+          hasElements = true;
         }
       }); // TODO: implement default heuristics
 
@@ -525,6 +548,19 @@ var QueryBuilder = {
         validatedQuery.filters = validatedQuery.filters.filter(function (f) {
           return f.operator;
         });
+      } // only set limit and offset if there are elements otherwise an invalid request with just limit/offset
+      // gets sent when the component is first mounted, but before the actual query is constructed.
+
+
+      if (hasElements) {
+        if (this.limit) {
+          validatedQuery.limit = this.limit;
+        }
+
+        if (this.offset) {
+          validatedQuery.offset = this.offset;
+        } // add order
+
       }
 
       return validatedQuery;
@@ -553,10 +589,10 @@ var QueryBuilder = {
           });
         }
       } else if (element === 'filters') {
-        var _dimension = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
         mem = _objectSpread({}, member, {
-          dimension: _dimension
+          member: filterMember
         });
       } else {
         mem = this["available".concat(name)].find(function (m) {
@@ -621,10 +657,10 @@ var QueryBuilder = {
           return x.dimension === old;
         });
 
-        var _dimension2 = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
         mem = _objectSpread({}, member, {
-          dimension: _dimension2
+          member: filterMember
         });
       } else {
         index = this[element].findIndex(function (x) {
@@ -664,10 +700,10 @@ var QueryBuilder = {
             });
           }
         } else if (element === 'filters') {
-          var _dimension3 = _objectSpread({}, _this4.meta.resolveMember(m.dimension, 'dimensions'));
+          var member = _objectSpread({}, _this4.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']));
 
           mem = _objectSpread({}, m, {
-            dimension: _dimension3
+            member: member
           });
         } else {
           mem = _this4["available".concat(name)].find(function (x) {
@@ -681,6 +717,18 @@ var QueryBuilder = {
       });
       this[element] = elements;
     },
+    setLimit: function setLimit(limit) {
+      this.limit = limit;
+    },
+    removeLimit: function removeLimit() {
+      this.limit = null;
+    },
+    setOffset: function setOffset(offset) {
+      this.offset = offset;
+    },
+    removeOffset: function removeOffset() {
+      this.offset = null;
+    },
     updateChart: function updateChart(chartType) {
       this.chartType = chartType;
     }
diff --git a/packages/cubejs-vue/dist/cubejs-vue.js b/packages/cubejs-vue/dist/cubejs-vue.js
index ddd3104e684e0..6286a96cfd1b4 100644
--- a/packages/cubejs-vue/dist/cubejs-vue.js
+++ b/packages/cubejs-vue/dist/cubejs-vue.js
@@ -326,7 +326,9 @@ var QueryBuilder = {
       availableMeasures: [],
       availableDimensions: [],
       availableTimeDimensions: [],
-      availableSegments: []
+      availableSegments: [],
+      limit: null,
+      offset: null
     };
     data.granularities = [{
       name: 'hour',
@@ -352,7 +354,7 @@ var QueryBuilder = {
     _regeneratorRuntime.mark(function _callee() {
       var _this = this;
 
-      var _this$query, measures, dimensions, segments, timeDimensions, filters;
+      var _this$query, measures, dimensions, segments, timeDimensions, filters, limit, offset;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -363,7 +365,7 @@ var QueryBuilder = {
 
             case 2:
               this.meta = _context.sent;
-              _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters;
+              _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters, limit = _this$query.limit, offset = _this$query.offset;
               this.measures = (measures || []).map(function (m, i) {
                 return _objectSpread({
                   index: i
@@ -389,8 +391,9 @@ var QueryBuilder = {
               });
               this.filters = (filters || []).map(function (m, i) {
                 return _objectSpread({}, m, {
-                  dimension: _this.meta.resolveMember(m.dimension, ['dimensions', 'measures']),
-                  operators: _this.meta.filterOperatorsForMember(m.dimension, ['dimensions', 'measures']),
+                  // using 'dimension' is deprecated, 'member' should be specified instead
+                  member: _this.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
+                  operators: _this.meta.filterOperatorsForMember(m.member || m.dimension, ['dimensions', 'measures']),
                   index: i
                 });
               });
@@ -400,8 +403,10 @@ var QueryBuilder = {
                 return m.type === 'time';
               });
               this.availableSegments = this.meta.membersForQuery({}, 'segments') || [];
+              this.limit = limit || null;
+              this.offset = offset || null;
 
-            case 13:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -430,7 +435,13 @@ var QueryBuilder = {
         availableSegments = this.availableSegments,
         availableTimeDimensions = this.availableTimeDimensions,
         availableDimensions = this.availableDimensions,
-        availableMeasures = this.availableMeasures;
+        availableMeasures = this.availableMeasures,
+        limit = this.limit,
+        offset = this.offset,
+        setLimit = this.setLimit,
+        removeLimit = this.removeLimit,
+        setOffset = this.setOffset,
+        removeOffset = this.removeOffset;
     var builderProps = {};
 
     if (meta) {
@@ -448,7 +459,13 @@ var QueryBuilder = {
         availableTimeDimensions: availableTimeDimensions,
         availableDimensions: availableDimensions,
         availableMeasures: availableMeasures,
-        updateChartType: this.updateChart
+        updateChartType: this.updateChart,
+        limit: limit,
+        offset: offset,
+        setLimit: setLimit,
+        removeLimit: removeLimit,
+        setOffset: setOffset,
+        removeOffset: removeOffset
       };
       QUERY_ELEMENTS.forEach(function (e) {
         var name = e.charAt(0).toUpperCase() + e.slice(1);
@@ -498,10 +515,15 @@ var QueryBuilder = {
 
       var toQuery = function toQuery(member) {
         return member.name;
-      }; // TODO: implement order, limit, timezone, renewQuery
+      }; // TODO: implement order, timezone, renewQuery
 
 
+      var hasElements = false;
       QUERY_ELEMENTS.forEach(function (e) {
+        if (!_this3[e]) {
+          return;
+        }
+
         if (e === 'timeDimensions') {
           toQuery = function toQuery(member) {
             return {
@@ -513,7 +535,7 @@ var QueryBuilder = {
         } else if (e === 'filters') {
           toQuery = function toQuery(member) {
             return {
-              dimension: member.dimension.name,
+              member: member.member.name,
               operator: member.operator,
               values: member.values
             };
@@ -524,6 +546,7 @@ var QueryBuilder = {
           validatedQuery[e] = _this3[e].map(function (x) {
             return toQuery(x);
           });
+          hasElements = true;
         }
       }); // TODO: implement default heuristics
 
@@ -531,6 +554,19 @@ var QueryBuilder = {
         validatedQuery.filters = validatedQuery.filters.filter(function (f) {
           return f.operator;
         });
+      } // only set limit and offset if there are elements otherwise an invalid request with just limit/offset
+      // gets sent when the component is first mounted, but before the actual query is constructed.
+
+
+      if (hasElements) {
+        if (this.limit) {
+          validatedQuery.limit = this.limit;
+        }
+
+        if (this.offset) {
+          validatedQuery.offset = this.offset;
+        } // add order
+
       }
 
       return validatedQuery;
@@ -559,10 +595,10 @@ var QueryBuilder = {
           });
         }
       } else if (element === 'filters') {
-        var _dimension = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
         mem = _objectSpread({}, member, {
-          dimension: _dimension
+          member: filterMember
         });
       } else {
         mem = this["available".concat(name)].find(function (m) {
@@ -627,10 +663,10 @@ var QueryBuilder = {
           return x.dimension === old;
         });
 
-        var _dimension2 = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+        var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
         mem = _objectSpread({}, member, {
-          dimension: _dimension2
+          member: filterMember
         });
       } else {
         index = this[element].findIndex(function (x) {
@@ -670,10 +706,10 @@ var QueryBuilder = {
             });
           }
         } else if (element === 'filters') {
-          var _dimension3 = _objectSpread({}, _this4.meta.resolveMember(m.dimension, 'dimensions'));
+          var member = _objectSpread({}, _this4.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']));
 
           mem = _objectSpread({}, m, {
-            dimension: _dimension3
+            member: member
           });
         } else {
           mem = _this4["available".concat(name)].find(function (x) {
@@ -687,6 +723,18 @@ var QueryBuilder = {
       });
       this[element] = elements;
     },
+    setLimit: function setLimit(limit) {
+      this.limit = limit;
+    },
+    removeLimit: function removeLimit() {
+      this.limit = null;
+    },
+    setOffset: function setOffset(offset) {
+      this.offset = offset;
+    },
+    removeOffset: function removeOffset() {
+      this.offset = null;
+    },
     updateChart: function updateChart(chartType) {
       this.chartType = chartType;
     }
diff --git a/packages/cubejs-vue/dist/cubejs-vue.umd.js b/packages/cubejs-vue/dist/cubejs-vue.umd.js
index cce5f8ab9975a..da9e691b2d87e 100644
--- a/packages/cubejs-vue/dist/cubejs-vue.umd.js
+++ b/packages/cubejs-vue/dist/cubejs-vue.umd.js
@@ -7613,7 +7613,9 @@
         availableMeasures: [],
         availableDimensions: [],
         availableTimeDimensions: [],
-        availableSegments: []
+        availableSegments: [],
+        limit: null,
+        offset: null
       };
       data.granularities = [{
         name: 'hour',
@@ -7639,7 +7641,7 @@
       regeneratorRuntime.mark(function _callee() {
         var _this = this;
 
-        var _this$query, measures, dimensions, segments, timeDimensions, filters;
+        var _this$query, measures, dimensions, segments, timeDimensions, filters, limit, offset;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -7650,7 +7652,7 @@
 
               case 2:
                 this.meta = _context.sent;
-                _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters;
+                _this$query = this.query, measures = _this$query.measures, dimensions = _this$query.dimensions, segments = _this$query.segments, timeDimensions = _this$query.timeDimensions, filters = _this$query.filters, limit = _this$query.limit, offset = _this$query.offset;
                 this.measures = (measures || []).map(function (m, i) {
                   return _objectSpread({
                     index: i
@@ -7676,8 +7678,9 @@
                 });
                 this.filters = (filters || []).map(function (m, i) {
                   return _objectSpread({}, m, {
-                    dimension: _this.meta.resolveMember(m.dimension, ['dimensions', 'measures']),
-                    operators: _this.meta.filterOperatorsForMember(m.dimension, ['dimensions', 'measures']),
+                    // using 'dimension' is deprecated, 'member' should be specified instead
+                    member: _this.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']),
+                    operators: _this.meta.filterOperatorsForMember(m.member || m.dimension, ['dimensions', 'measures']),
                     index: i
                   });
                 });
@@ -7687,8 +7690,10 @@
                   return m.type === 'time';
                 });
                 this.availableSegments = this.meta.membersForQuery({}, 'segments') || [];
+                this.limit = limit || null;
+                this.offset = offset || null;
 
-              case 13:
+              case 15:
               case "end":
                 return _context.stop();
             }
@@ -7717,7 +7722,13 @@
           availableSegments = this.availableSegments,
           availableTimeDimensions = this.availableTimeDimensions,
           availableDimensions = this.availableDimensions,
-          availableMeasures = this.availableMeasures;
+          availableMeasures = this.availableMeasures,
+          limit = this.limit,
+          offset = this.offset,
+          setLimit = this.setLimit,
+          removeLimit = this.removeLimit,
+          setOffset = this.setOffset,
+          removeOffset = this.removeOffset;
       var builderProps = {};
 
       if (meta) {
@@ -7735,7 +7746,13 @@
           availableTimeDimensions: availableTimeDimensions,
           availableDimensions: availableDimensions,
           availableMeasures: availableMeasures,
-          updateChartType: this.updateChart
+          updateChartType: this.updateChart,
+          limit: limit,
+          offset: offset,
+          setLimit: setLimit,
+          removeLimit: removeLimit,
+          setOffset: setOffset,
+          removeOffset: removeOffset
         };
         QUERY_ELEMENTS.forEach(function (e) {
           var name = e.charAt(0).toUpperCase() + e.slice(1);
@@ -7785,10 +7802,15 @@
 
         var toQuery = function toQuery(member) {
           return member.name;
-        }; // TODO: implement order, limit, timezone, renewQuery
+        }; // TODO: implement order, timezone, renewQuery
 
 
+        var hasElements = false;
         QUERY_ELEMENTS.forEach(function (e) {
+          if (!_this3[e]) {
+            return;
+          }
+
           if (e === 'timeDimensions') {
             toQuery = function toQuery(member) {
               return {
@@ -7800,7 +7822,7 @@
           } else if (e === 'filters') {
             toQuery = function toQuery(member) {
               return {
-                dimension: member.dimension.name,
+                member: member.member.name,
                 operator: member.operator,
                 values: member.values
               };
@@ -7811,6 +7833,7 @@
             validatedQuery[e] = _this3[e].map(function (x) {
               return toQuery(x);
             });
+            hasElements = true;
           }
         }); // TODO: implement default heuristics
 
@@ -7818,6 +7841,19 @@
           validatedQuery.filters = validatedQuery.filters.filter(function (f) {
             return f.operator;
           });
+        } // only set limit and offset if there are elements otherwise an invalid request with just limit/offset
+        // gets sent when the component is first mounted, but before the actual query is constructed.
+
+
+        if (hasElements) {
+          if (this.limit) {
+            validatedQuery.limit = this.limit;
+          }
+
+          if (this.offset) {
+            validatedQuery.offset = this.offset;
+          } // add order
+
         }
 
         return validatedQuery;
@@ -7846,10 +7882,10 @@
             });
           }
         } else if (element === 'filters') {
-          var _dimension = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+          var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
           mem = _objectSpread({}, member, {
-            dimension: _dimension
+            member: filterMember
           });
         } else {
           mem = this["available".concat(name)].find(function (m) {
@@ -7914,10 +7950,10 @@
             return x.dimension === old;
           });
 
-          var _dimension2 = _objectSpread({}, this.meta.resolveMember(member.dimension, 'dimensions'));
+          var filterMember = _objectSpread({}, this.meta.resolveMember(member.member || member.dimension, ['dimensions', 'measures']));
 
           mem = _objectSpread({}, member, {
-            dimension: _dimension2
+            member: filterMember
           });
         } else {
           index = this[element].findIndex(function (x) {
@@ -7957,10 +7993,10 @@
               });
             }
           } else if (element === 'filters') {
-            var _dimension3 = _objectSpread({}, _this4.meta.resolveMember(m.dimension, 'dimensions'));
+            var member = _objectSpread({}, _this4.meta.resolveMember(m.member || m.dimension, ['dimensions', 'measures']));
 
             mem = _objectSpread({}, m, {
-              dimension: _dimension3
+              member: member
             });
           } else {
             mem = _this4["available".concat(name)].find(function (x) {
@@ -7974,6 +8010,18 @@
         });
         this[element] = elements;
       },
+      setLimit: function setLimit(limit) {
+        this.limit = limit;
+      },
+      removeLimit: function removeLimit() {
+        this.limit = null;
+      },
+      setOffset: function setOffset(offset) {
+        this.offset = offset;
+      },
+      removeOffset: function removeOffset() {
+        this.offset = null;
+      },
       updateChart: function updateChart(chartType) {
         this.chartType = chartType;
       }