@appbaseio/reactivesearch-vue 1.16.0-alpha.36 → 1.16.0-alpha.37

package/dist/@appbaseio/reactivesearch-vue.umd.js

@@ -4865,7 +4865,7 @@
 	  Object.defineProperty(exports, "__esModule", {
 	    value: true
 	  });
-	  exports.getCalendarIntervalErrorMessage = exports.queryFormatMillisecondsMap = exports.suggestionTypes = exports.getTopSuggestions = exports.withClickIds = exports.getCompositeAggsQuery = exports.getAggsQuery = exports.extractQueryFromDefaultQuery = exports.updateInternalQuery = exports.getSearchState = exports.getOptionsFromQuery = exports.parseHits = exports.handleA11yAction = exports.getInnerKey = exports.getClassName = exports.checkSomePropChange = exports.checkPropChange = exports.updateDefaultQuery = exports.updateCustomQuery = undefined;
+	  exports.getCalendarIntervalErrorMessage = exports.queryFormatMillisecondsMap = exports.suggestionTypes = exports.getTopSuggestions = exports.withClickIds = exports.getCompositeAggsQuery = exports.getAggsQuery = exports.extractQueryFromDefaultQuery = exports.updateInternalQuery = exports.getSearchState = exports.extractQueryFromCustomQuery = exports.getOptionsForCustomQuery = exports.getOptionsFromQuery = exports.parseHits = exports.handleA11yAction = exports.getInnerKey = exports.getClassName = exports.checkSomePropChange = exports.checkPropChange = exports.updateDefaultQuery = exports.updateCustomQuery = undefined;
 
 	  var _extends = Object.assign || function (target) {
 	    for (var i = 1; i < arguments.length; i++) {
@@ -5311,6 +5311,38 @@
 
 	  exports.getOptionsFromQuery = getOptionsFromQuery;
 
+	  var getOptionsForCustomQuery = function getOptionsForCustomQuery() {
+	    var customQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+	    if (customQuery) {
+	      var query = customQuery.query,
+	          id = customQuery.id,
+	          params = customQuery.params,
+	          rest = _objectWithoutProperties(customQuery, ['query', 'id', 'params']);
+
+	      return Object.keys(rest).length ? rest : null;
+	    }
+
+	    return null;
+	  };
+
+	  exports.getOptionsForCustomQuery = getOptionsForCustomQuery;
+
+	  var extractQueryFromCustomQuery = exports.extractQueryFromCustomQuery = function extractQueryFromCustomQuery(customQuery) {
+	    if (customQuery) {
+	      if (customQuery.id) {
+	        return {
+	          id: customQuery.id,
+	          params: customQuery.params
+	        };
+	      }
+
+	      return customQuery.query;
+	    }
+
+	    return null;
+	  };
+
 	  function computeResultStats(hits, searchState, promotedResults) {
 	    Object.keys(hits).forEach(function (componentId) {
 	      var _ref = hits[componentId] || {},
@@ -5736,28 +5768,30 @@
 	var helper_8 = helper.extractQueryFromDefaultQuery;
 	var helper_9 = helper.updateInternalQuery;
 	var helper_10 = helper.getSearchState;
-	var helper_11 = helper.getOptionsFromQuery;
-	var helper_12 = helper.parseHits;
-	var helper_13 = helper.handleA11yAction;
-	var helper_14 = helper.getInnerKey;
-	var helper_15 = helper.getClassName;
-	var helper_16 = helper.checkSomePropChange;
-	var helper_17 = helper.checkPropChange;
-	var helper_18 = helper.updateDefaultQuery;
-	var helper_19 = helper.updateCustomQuery;
-	var helper_20 = helper.isEqual;
-	var helper_21 = helper.debounce;
-	var helper_22 = helper.getQueryOptions;
-	var helper_23 = helper.buildQuery;
-	var helper_24 = helper.pushToAndClause;
-	var helper_25 = helper.checkValueChange;
-	var helper_26 = helper.getAggsOrder;
-	var helper_27 = helper.formatDate;
-	var helper_28 = helper.getResultStats;
-	var helper_29 = helper.extractFieldsFromSource;
-	var helper_30 = helper.normalizeDataField;
-	var helper_31 = helper.handleOnSuggestions;
-	var helper_32 = helper.isValidDateRangeQueryFormat;
+	var helper_11 = helper.extractQueryFromCustomQuery;
+	var helper_12 = helper.getOptionsForCustomQuery;
+	var helper_13 = helper.getOptionsFromQuery;
+	var helper_14 = helper.parseHits;
+	var helper_15 = helper.handleA11yAction;
+	var helper_16 = helper.getInnerKey;
+	var helper_17 = helper.getClassName;
+	var helper_18 = helper.checkSomePropChange;
+	var helper_19 = helper.checkPropChange;
+	var helper_20 = helper.updateDefaultQuery;
+	var helper_21 = helper.updateCustomQuery;
+	var helper_22 = helper.isEqual;
+	var helper_23 = helper.debounce;
+	var helper_24 = helper.getQueryOptions;
+	var helper_25 = helper.buildQuery;
+	var helper_26 = helper.pushToAndClause;
+	var helper_27 = helper.checkValueChange;
+	var helper_28 = helper.getAggsOrder;
+	var helper_29 = helper.formatDate;
+	var helper_30 = helper.getResultStats;
+	var helper_31 = helper.extractFieldsFromSource;
+	var helper_32 = helper.normalizeDataField;
+	var helper_33 = helper.handleOnSuggestions;
+	var helper_34 = helper.isValidDateRangeQueryFormat;
 
 	var value = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -8414,7 +8448,7 @@
 	  exports.Response = ctx.Response;
 	  module.exports = exports;
 	});
-	unwrapExports(browserPonyfill);
+	var fetch$1 = unwrapExports(browserPonyfill);
 	var browserPonyfill_1 = browserPonyfill.fetch;
 	var browserPonyfill_2 = browserPonyfill.Headers;
 	var browserPonyfill_3 = browserPonyfill.Request;
@@ -14094,9 +14128,10 @@
 	    getQueryOptions = lib_8.getQueryOptions,
 	    getClassName$1 = lib_8.getClassName,
 	    parseHits = lib_8.parseHits,
-	    getOptionsFromQuery = lib_8.getOptionsFromQuery,
 	    getCompositeAggsQuery = lib_8.getCompositeAggsQuery,
-	    getResultStats = lib_8.getResultStats;
+	    getResultStats = lib_8.getResultStats,
+	    extractQueryFromCustomQuery = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery = lib_8.getOptionsForCustomQuery;
 	var ReactiveList = {
 	  name: 'ReactiveList',
 	  components: {
@@ -14159,6 +14194,12 @@
 	      });
 	    }
 
+	    if (this.urlSortOption) {
+	      this.sortOptionIndex = this.$props.sortOptions.findIndex(function (s) {
+	        return s.label === _this.urlSortOption;
+	      }) || 0;
+	    }
+
 	    this.updateComponentProps(this.componentId, {
 	      from: this.from
 	    }, constants_1$1.reactiveList);
@@ -14288,19 +14329,11 @@
 	        var options = getQueryOptions(this.$props);
 	        options.from = 0;
 	        this.$defaultQuery = newVal(null, this.$props);
-
-	        var _ref = this.$defaultQuery || {},
-	            sort = _ref.sort,
-	            query = _ref.query;
-
-	        if (sort) {
-	          options.sort = this.$defaultQuery.sort;
-	        }
-
-	        var queryOptions = getOptionsFromQuery(this.$defaultQuery);
+	        var query = extractQueryFromCustomQuery(this.$defaultQuery);
+	        var queryOptions = getOptionsForCustomQuery(this.$defaultQuery);
 
 	        if (queryOptions) {
-	          options = _extends({}, options, getOptionsFromQuery(this.$defaultQuery));
+	          options = _extends({}, options, queryOptions);
 	        } // Update calculated default query in store
 
 
@@ -14391,24 +14424,24 @@
 	    options.from = this.$data.from;
 
 	    if (this.sortOptions && this.sortOptions[this.sortOptionIndex]) {
-	      var _ref2;
+	      var _ref;
 
 	      var sortField = this.sortOptions[this.sortOptionIndex].dataField;
 	      var sortBy = this.sortOptions[this.sortOptionIndex].sortBy;
-	      options.sort = [(_ref2 = {}, _ref2[sortField] = {
+	      options.sort = [(_ref = {}, _ref[sortField] = {
 	        order: sortBy
-	      }, _ref2)]; // To handle sort options for RS API
+	      }, _ref)]; // To handle sort options for RS API
 
 	      this.updateComponentProps(this.componentId, {
 	        dataField: sortField,
 	        sortBy: sortBy
 	      }, constants_1$1.reactiveList);
 	    } else if (this.$props.sortBy) {
-	      var _ref3;
+	      var _ref2;
 
-	      options.sort = [(_ref3 = {}, _ref3[this.$props.dataField] = {
+	      options.sort = [(_ref2 = {}, _ref2[this.$props.dataField] = {
 	        order: this.$props.sortBy
-	      }, _ref3)];
+	      }, _ref2)];
 	    } // Override sort query with defaultQuery's sort if defined
 
 
@@ -14416,20 +14449,13 @@
 
 	    if (this.$props.defaultQuery) {
 	      this.$defaultQuery = this.$props.defaultQuery();
-	      options = _extends({}, options, getOptionsFromQuery(this.$defaultQuery));
-
-	      if (this.$defaultQuery.sort) {
-	        options.sort = this.$defaultQuery.sort;
-	      } // Update calculated default query in store
-
+	      options = _extends({}, options, getOptionsForCustomQuery(this.$defaultQuery)); // Update calculated default query in store
 
 	      updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props);
 	    } // execute is set to false at the time of mount
 
 
-	    var _ref4 = this.$defaultQuery || {},
-	        query = _ref4.query;
-
+	    var query = extractQueryFromCustomQuery(this.$defaultQuery);
 	    var execute = false;
 	    this.setQueryOptions(this.$props.componentId, _extends({}, options, this.getAggsQuery()), execute);
 
@@ -14544,18 +14570,18 @@
 	        }) : 0;
 
 	        if (props.sortOptions[sortOptionIndex]) {
-	          var _ref5;
+	          var _ref3;
 
-	          options.sort = [(_ref5 = {}, _ref5[props.sortOptions[sortOptionIndex].dataField] = {
+	          options.sort = [(_ref3 = {}, _ref3[props.sortOptions[sortOptionIndex].dataField] = {
 	            order: props.sortOptions[sortOptionIndex].sortBy
-	          }, _ref5)];
+	          }, _ref3)];
 	        }
 	      } else if (props.sortBy) {
-	        var _ref6;
+	        var _ref4;
 
-	        options.sort = [(_ref6 = {}, _ref6[props.dataField] = {
+	        options.sort = [(_ref4 = {}, _ref4[props.dataField] = {
 	          order: props.sortBy
-	        }, _ref6)];
+	        }, _ref4)];
 	      }
 
 	      this.setQueryOptions(this.$props.componentId, _extends({}, options, this.getAggsQuery()), true);
@@ -14658,16 +14684,16 @@
 	      var index = e.target.value;
 
 	      if (this.sortOptions && this.sortOptions[index]) {
-	        var _ref7;
+	        var _ref5;
 
 	        // This fixes issue #371 (where sorting a multi-result page with infinite loader breaks)
 	        var options = getQueryOptions(this.$props);
 	        options.from = 0;
 	        var sortField = this.sortOptions[index].dataField;
 	        var sortBy = this.sortOptions[index].sortBy;
-	        options.sort = [(_ref7 = {}, _ref7[sortField] = {
+	        options.sort = [(_ref5 = {}, _ref5[sortField] = {
 	          order: sortBy
-	        }, _ref7)];
+	        }, _ref5)];
 	        this.sortOptionIndex = index; // To handle sort options for RS API
 
 	        this.updateComponentProps(this.componentId, {
@@ -14675,8 +14701,11 @@
 	          sortBy: sortBy
 	        }, constants_1$1.reactiveList);
 	        this.setQueryOptions(this.$props.componentId, options, true);
+	        this.setPage(0);
 	        this.currentPageState = 0;
 	        this.from = 0;
+	        var sortOption = this.$props.sortOptions[this.sortOptionIndex] ? this.$props.sortOptions[this.sortOptionIndex].label : null;
+	        this.setPageURL(this.$props.componentId + "sortOption", sortOption, this.$props.componentId + "sortOption", false, this.$props.URLParams);
 	      }
 	    },
 	    triggerClickAnalytics: function triggerClickAnalytics(searchPosition, documentId) {
@@ -14788,6 +14817,7 @@
 	var mapStateToProps$1 = function mapStateToProps(state, props) {
 	  return {
 	    defaultPage: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value - 1,
+	    urlSortOption: state.selectedValues[props.componentId + "sortOption"] && state.selectedValues[props.componentId + "sortOption"].value,
 	    hits: state.hits[props.componentId] && state.hits[props.componentId].hits,
 	    rawData: state.rawData[props.componentId],
 	    aggregationData: state.compositeAggregations[props.componentId],
@@ -14828,7 +14858,7 @@
 	  options.size = size || 10;
 
 	  var getSortOption = function getSortOption() {
-	    var _ref9;
+	    var _ref7;
 
 	    if (defaultSortOption) {
 	      var sortOption = sortOptionsNew.find(function (option) {
@@ -14836,35 +14866,39 @@
 	      });
 
 	      if (sortOption) {
-	        var _ref8;
+	        var _ref6;
 
-	        return _ref8 = {}, _ref8[sortOption.dataField] = {
+	        return _ref6 = {}, _ref6[sortOption.dataField] = {
 	          order: sortOption.sortBy
-	        }, _ref8;
+	        }, _ref6;
 	      }
 	    }
 
-	    return _ref9 = {}, _ref9[sortOptionsNew[0].dataField] = {
+	    return _ref7 = {}, _ref7[sortOptionsNew[0].dataField] = {
 	      order: sortOptionsNew[0].sortBy
-	    }, _ref9;
+	    }, _ref7;
 	  };
 
 	  if (sortOptionsNew) {
 	    options.sort = [getSortOption()];
 	  } else if (sortBy) {
-	    var _ref10;
+	    var _ref8;
 
-	    options.sort = [(_ref10 = {}, _ref10[dataField] = {
+	    options.sort = [(_ref8 = {}, _ref8[dataField] = {
 	      order: sortBy
-	    }, _ref10)];
+	    }, _ref8)];
 	  }
 
 	  return options;
 	};
 
+	ReactiveList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var RLConnected = ComponentWrapper$1(connect(mapStateToProps$1, mapDispatchtoProps)(ReactiveList), {
 	  componentType: constants_1$1.reactiveList,
-	  internalComponent: true
+	  internalComponent: ReactiveList.hasInternalComponent()
 	});
 
 	ReactiveList.install = function (Vue) {
@@ -14918,609 +14952,94 @@
 
 	  var len = qs.length; // maxKeys <= 0 means that we should not limit keys count
 
-	  if (maxKeys > 0 && len > maxKeys) {
-	    len = maxKeys;
-	  }
-
-	  for (var i = 0; i < len; ++i) {
-	    var x = qs[i].replace(regexp, '%20'),
-	        idx = x.indexOf(eq),
-	        kstr,
-	        vstr,
-	        k,
-	        v;
-
-	    if (idx >= 0) {
-	      kstr = x.substr(0, idx);
-	      vstr = x.substr(idx + 1);
-	    } else {
-	      kstr = x;
-	      vstr = '';
-	    }
-
-	    k = decodeURIComponent(kstr);
-	    v = decodeURIComponent(vstr);
-
-	    if (!hasOwnProperty(obj, k)) {
-	      obj[k] = v;
-	    } else if (Array.isArray(obj[k])) {
-	      obj[k].push(v);
-	    } else {
-	      obj[k] = [obj[k], v];
-	    }
-	  }
-
-	  return obj;
-	};
-
-	// Copyright Joyent, Inc. and other Node contributors.
-
-	var stringifyPrimitive = function stringifyPrimitive(v) {
-	  switch (typeof v) {
-	    case 'string':
-	      return v;
-
-	    case 'boolean':
-	      return v ? 'true' : 'false';
-
-	    case 'number':
-	      return isFinite(v) ? v : '';
-
-	    default:
-	      return '';
-	  }
-	};
-
-	var encode = function encode(obj, sep, eq, name) {
-	  sep = sep || '&';
-	  eq = eq || '=';
-
-	  if (obj === null) {
-	    obj = undefined;
-	  }
-
-	  if (typeof obj === 'object') {
-	    return Object.keys(obj).map(function (k) {
-	      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
-
-	      if (Array.isArray(obj[k])) {
-	        return obj[k].map(function (v) {
-	          return ks + encodeURIComponent(stringifyPrimitive(v));
-	        }).join(sep);
-	      } else {
-	        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
-	      }
-	    }).filter(Boolean).join(sep);
-	  }
-
-	  if (!name) return '';
-	  return encodeURIComponent(stringifyPrimitive(name)) + eq + encodeURIComponent(stringifyPrimitive(obj));
-	};
-
-	var querystring = createCommonjsModule(function (module, exports) {
-
-	  exports.decode = exports.parse = decode;
-	  exports.encode = exports.stringify = encode;
-	});
-	var querystring_1 = querystring.decode;
-	var querystring_2 = querystring.parse;
-	var querystring_3 = querystring.encode;
-	var querystring_4 = querystring.stringify;
-
-	var browserPonyfill$1 = createCommonjsModule(function (module) {
-	  var __root__ = function (root) {
-	    function F() {
-	      this.fetch = false;
-	    }
-
-	    F.prototype = root;
-	    return new F();
-	  }(typeof self !== 'undefined' ? self : commonjsGlobal);
-
-	  (function (self) {
-	    (function (self) {
-	      if (self.fetch) {
-	        return;
-	      }
-
-	      var support = {
-	        searchParams: 'URLSearchParams' in self,
-	        iterable: 'Symbol' in self && 'iterator' in Symbol,
-	        blob: 'FileReader' in self && 'Blob' in self && function () {
-	          try {
-	            new Blob();
-	            return true;
-	          } catch (e) {
-	            return false;
-	          }
-	        }(),
-	        formData: 'FormData' in self,
-	        arrayBuffer: 'ArrayBuffer' in self
-	      };
-
-	      if (support.arrayBuffer) {
-	        var viewClasses = ['[object Int8Array]', '[object Uint8Array]', '[object Uint8ClampedArray]', '[object Int16Array]', '[object Uint16Array]', '[object Int32Array]', '[object Uint32Array]', '[object Float32Array]', '[object Float64Array]'];
-
-	        var isDataView = function isDataView(obj) {
-	          return obj && DataView.prototype.isPrototypeOf(obj);
-	        };
-
-	        var isArrayBufferView = ArrayBuffer.isView || function (obj) {
-	          return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1;
-	        };
-	      }
-
-	      function normalizeName(name) {
-	        if (typeof name !== 'string') {
-	          name = String(name);
-	        }
-
-	        if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
-	          throw new TypeError('Invalid character in header field name');
-	        }
-
-	        return name.toLowerCase();
-	      }
-
-	      function normalizeValue(value) {
-	        if (typeof value !== 'string') {
-	          value = String(value);
-	        }
-
-	        return value;
-	      } // Build a destructive iterator for the value list
-
-
-	      function iteratorFor(items) {
-	        var iterator = {
-	          next: function next() {
-	            var value = items.shift();
-	            return {
-	              done: value === undefined,
-	              value: value
-	            };
-	          }
-	        };
-
-	        if (support.iterable) {
-	          iterator[Symbol.iterator] = function () {
-	            return iterator;
-	          };
-	        }
-
-	        return iterator;
-	      }
-
-	      function Headers(headers) {
-	        this.map = {};
-
-	        if (headers instanceof Headers) {
-	          headers.forEach(function (value, name) {
-	            this.append(name, value);
-	          }, this);
-	        } else if (Array.isArray(headers)) {
-	          headers.forEach(function (header) {
-	            this.append(header[0], header[1]);
-	          }, this);
-	        } else if (headers) {
-	          Object.getOwnPropertyNames(headers).forEach(function (name) {
-	            this.append(name, headers[name]);
-	          }, this);
-	        }
-	      }
-
-	      Headers.prototype.append = function (name, value) {
-	        name = normalizeName(name);
-	        value = normalizeValue(value);
-	        var oldValue = this.map[name];
-	        this.map[name] = oldValue ? oldValue + ',' + value : value;
-	      };
-
-	      Headers.prototype['delete'] = function (name) {
-	        delete this.map[normalizeName(name)];
-	      };
-
-	      Headers.prototype.get = function (name) {
-	        name = normalizeName(name);
-	        return this.has(name) ? this.map[name] : null;
-	      };
-
-	      Headers.prototype.has = function (name) {
-	        return this.map.hasOwnProperty(normalizeName(name));
-	      };
-
-	      Headers.prototype.set = function (name, value) {
-	        this.map[normalizeName(name)] = normalizeValue(value);
-	      };
-
-	      Headers.prototype.forEach = function (callback, thisArg) {
-	        for (var name in this.map) {
-	          if (this.map.hasOwnProperty(name)) {
-	            callback.call(thisArg, this.map[name], name, this);
-	          }
-	        }
-	      };
-
-	      Headers.prototype.keys = function () {
-	        var items = [];
-	        this.forEach(function (value, name) {
-	          items.push(name);
-	        });
-	        return iteratorFor(items);
-	      };
-
-	      Headers.prototype.values = function () {
-	        var items = [];
-	        this.forEach(function (value) {
-	          items.push(value);
-	        });
-	        return iteratorFor(items);
-	      };
-
-	      Headers.prototype.entries = function () {
-	        var items = [];
-	        this.forEach(function (value, name) {
-	          items.push([name, value]);
-	        });
-	        return iteratorFor(items);
-	      };
-
-	      if (support.iterable) {
-	        Headers.prototype[Symbol.iterator] = Headers.prototype.entries;
-	      }
-
-	      function consumed(body) {
-	        if (body.bodyUsed) {
-	          return Promise.reject(new TypeError('Already read'));
-	        }
-
-	        body.bodyUsed = true;
-	      }
-
-	      function fileReaderReady(reader) {
-	        return new Promise(function (resolve, reject) {
-	          reader.onload = function () {
-	            resolve(reader.result);
-	          };
-
-	          reader.onerror = function () {
-	            reject(reader.error);
-	          };
-	        });
-	      }
-
-	      function readBlobAsArrayBuffer(blob) {
-	        var reader = new FileReader();
-	        var promise = fileReaderReady(reader);
-	        reader.readAsArrayBuffer(blob);
-	        return promise;
-	      }
-
-	      function readBlobAsText(blob) {
-	        var reader = new FileReader();
-	        var promise = fileReaderReady(reader);
-	        reader.readAsText(blob);
-	        return promise;
-	      }
-
-	      function readArrayBufferAsText(buf) {
-	        var view = new Uint8Array(buf);
-	        var chars = new Array(view.length);
-
-	        for (var i = 0; i < view.length; i++) {
-	          chars[i] = String.fromCharCode(view[i]);
-	        }
-
-	        return chars.join('');
-	      }
-
-	      function bufferClone(buf) {
-	        if (buf.slice) {
-	          return buf.slice(0);
-	        } else {
-	          var view = new Uint8Array(buf.byteLength);
-	          view.set(new Uint8Array(buf));
-	          return view.buffer;
-	        }
-	      }
-
-	      function Body() {
-	        this.bodyUsed = false;
-
-	        this._initBody = function (body) {
-	          this._bodyInit = body;
-
-	          if (!body) {
-	            this._bodyText = '';
-	          } else if (typeof body === 'string') {
-	            this._bodyText = body;
-	          } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
-	            this._bodyBlob = body;
-	          } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
-	            this._bodyFormData = body;
-	          } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-	            this._bodyText = body.toString();
-	          } else if (support.arrayBuffer && support.blob && isDataView(body)) {
-	            this._bodyArrayBuffer = bufferClone(body.buffer); // IE 10-11 can't handle a DataView body.
-
-	            this._bodyInit = new Blob([this._bodyArrayBuffer]);
-	          } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
-	            this._bodyArrayBuffer = bufferClone(body);
-	          } else {
-	            throw new Error('unsupported BodyInit type');
-	          }
-
-	          if (!this.headers.get('content-type')) {
-	            if (typeof body === 'string') {
-	              this.headers.set('content-type', 'text/plain;charset=UTF-8');
-	            } else if (this._bodyBlob && this._bodyBlob.type) {
-	              this.headers.set('content-type', this._bodyBlob.type);
-	            } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
-	              this.headers.set('content-type', 'application/x-www-form-urlencoded;charset=UTF-8');
-	            }
-	          }
-	        };
-
-	        if (support.blob) {
-	          this.blob = function () {
-	            var rejected = consumed(this);
-
-	            if (rejected) {
-	              return rejected;
-	            }
-
-	            if (this._bodyBlob) {
-	              return Promise.resolve(this._bodyBlob);
-	            } else if (this._bodyArrayBuffer) {
-	              return Promise.resolve(new Blob([this._bodyArrayBuffer]));
-	            } else if (this._bodyFormData) {
-	              throw new Error('could not read FormData body as blob');
-	            } else {
-	              return Promise.resolve(new Blob([this._bodyText]));
-	            }
-	          };
-
-	          this.arrayBuffer = function () {
-	            if (this._bodyArrayBuffer) {
-	              return consumed(this) || Promise.resolve(this._bodyArrayBuffer);
-	            } else {
-	              return this.blob().then(readBlobAsArrayBuffer);
-	            }
-	          };
-	        }
-
-	        this.text = function () {
-	          var rejected = consumed(this);
-
-	          if (rejected) {
-	            return rejected;
-	          }
-
-	          if (this._bodyBlob) {
-	            return readBlobAsText(this._bodyBlob);
-	          } else if (this._bodyArrayBuffer) {
-	            return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer));
-	          } else if (this._bodyFormData) {
-	            throw new Error('could not read FormData body as text');
-	          } else {
-	            return Promise.resolve(this._bodyText);
-	          }
-	        };
-
-	        if (support.formData) {
-	          this.formData = function () {
-	            return this.text().then(decode);
-	          };
-	        }
-
-	        this.json = function () {
-	          return this.text().then(JSON.parse);
-	        };
-
-	        return this;
-	      } // HTTP methods whose capitalization should be normalized
-
-
-	      var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT'];
-
-	      function normalizeMethod(method) {
-	        var upcased = method.toUpperCase();
-	        return methods.indexOf(upcased) > -1 ? upcased : method;
-	      }
-
-	      function Request(input, options) {
-	        options = options || {};
-	        var body = options.body;
-
-	        if (input instanceof Request) {
-	          if (input.bodyUsed) {
-	            throw new TypeError('Already read');
-	          }
-
-	          this.url = input.url;
-	          this.credentials = input.credentials;
-
-	          if (!options.headers) {
-	            this.headers = new Headers(input.headers);
-	          }
-
-	          this.method = input.method;
-	          this.mode = input.mode;
-
-	          if (!body && input._bodyInit != null) {
-	            body = input._bodyInit;
-	            input.bodyUsed = true;
-	          }
-	        } else {
-	          this.url = String(input);
-	        }
-
-	        this.credentials = options.credentials || this.credentials || 'omit';
-
-	        if (options.headers || !this.headers) {
-	          this.headers = new Headers(options.headers);
-	        }
-
-	        this.method = normalizeMethod(options.method || this.method || 'GET');
-	        this.mode = options.mode || this.mode || null;
-	        this.referrer = null;
-
-	        if ((this.method === 'GET' || this.method === 'HEAD') && body) {
-	          throw new TypeError('Body not allowed for GET or HEAD requests');
-	        }
-
-	        this._initBody(body);
-	      }
-
-	      Request.prototype.clone = function () {
-	        return new Request(this, {
-	          body: this._bodyInit
-	        });
-	      };
-
-	      function decode(body) {
-	        var form = new FormData();
-	        body.trim().split('&').forEach(function (bytes) {
-	          if (bytes) {
-	            var split = bytes.split('=');
-	            var name = split.shift().replace(/\+/g, ' ');
-	            var value = split.join('=').replace(/\+/g, ' ');
-	            form.append(decodeURIComponent(name), decodeURIComponent(value));
-	          }
-	        });
-	        return form;
-	      }
-
-	      function parseHeaders(rawHeaders) {
-	        var headers = new Headers(); // Replace instances of \r\n and \n followed by at least one space or horizontal tab with a space
-	        // https://tools.ietf.org/html/rfc7230#section-3.2
-
-	        var preProcessedHeaders = rawHeaders.replace(/\r?\n[\t ]+/g, ' ');
-	        preProcessedHeaders.split(/\r?\n/).forEach(function (line) {
-	          var parts = line.split(':');
-	          var key = parts.shift().trim();
-
-	          if (key) {
-	            var value = parts.join(':').trim();
-	            headers.append(key, value);
-	          }
-	        });
-	        return headers;
-	      }
-
-	      Body.call(Request.prototype);
-
-	      function Response(bodyInit, options) {
-	        if (!options) {
-	          options = {};
-	        }
-
-	        this.type = 'default';
-	        this.status = options.status === undefined ? 200 : options.status;
-	        this.ok = this.status >= 200 && this.status < 300;
-	        this.statusText = 'statusText' in options ? options.statusText : 'OK';
-	        this.headers = new Headers(options.headers);
-	        this.url = options.url || '';
-
-	        this._initBody(bodyInit);
-	      }
-
-	      Body.call(Response.prototype);
+	  if (maxKeys > 0 && len > maxKeys) {
+	    len = maxKeys;
+	  }
 
-	      Response.prototype.clone = function () {
-	        return new Response(this._bodyInit, {
-	          status: this.status,
-	          statusText: this.statusText,
-	          headers: new Headers(this.headers),
-	          url: this.url
-	        });
-	      };
+	  for (var i = 0; i < len; ++i) {
+	    var x = qs[i].replace(regexp, '%20'),
+	        idx = x.indexOf(eq),
+	        kstr,
+	        vstr,
+	        k,
+	        v;
 
-	      Response.error = function () {
-	        var response = new Response(null, {
-	          status: 0,
-	          statusText: ''
-	        });
-	        response.type = 'error';
-	        return response;
-	      };
+	    if (idx >= 0) {
+	      kstr = x.substr(0, idx);
+	      vstr = x.substr(idx + 1);
+	    } else {
+	      kstr = x;
+	      vstr = '';
+	    }
 
-	      var redirectStatuses = [301, 302, 303, 307, 308];
+	    k = decodeURIComponent(kstr);
+	    v = decodeURIComponent(vstr);
 
-	      Response.redirect = function (url, status) {
-	        if (redirectStatuses.indexOf(status) === -1) {
-	          throw new RangeError('Invalid status code');
-	        }
+	    if (!hasOwnProperty(obj, k)) {
+	      obj[k] = v;
+	    } else if (Array.isArray(obj[k])) {
+	      obj[k].push(v);
+	    } else {
+	      obj[k] = [obj[k], v];
+	    }
+	  }
 
-	        return new Response(null, {
-	          status: status,
-	          headers: {
-	            location: url
-	          }
-	        });
-	      };
+	  return obj;
+	};
 
-	      self.Headers = Headers;
-	      self.Request = Request;
-	      self.Response = Response;
+	// Copyright Joyent, Inc. and other Node contributors.
 
-	      self.fetch = function (input, init) {
-	        return new Promise(function (resolve, reject) {
-	          var request = new Request(input, init);
-	          var xhr = new XMLHttpRequest();
+	var stringifyPrimitive = function stringifyPrimitive(v) {
+	  switch (typeof v) {
+	    case 'string':
+	      return v;
 
-	          xhr.onload = function () {
-	            var options = {
-	              status: xhr.status,
-	              statusText: xhr.statusText,
-	              headers: parseHeaders(xhr.getAllResponseHeaders() || '')
-	            };
-	            options.url = 'responseURL' in xhr ? xhr.responseURL : options.headers.get('X-Request-URL');
-	            var body = 'response' in xhr ? xhr.response : xhr.responseText;
-	            resolve(new Response(body, options));
-	          };
+	    case 'boolean':
+	      return v ? 'true' : 'false';
 
-	          xhr.onerror = function () {
-	            reject(new TypeError('Network request failed'));
-	          };
+	    case 'number':
+	      return isFinite(v) ? v : '';
 
-	          xhr.ontimeout = function () {
-	            reject(new TypeError('Network request failed'));
-	          };
+	    default:
+	      return '';
+	  }
+	};
 
-	          xhr.open(request.method, request.url, true);
+	var encode = function encode(obj, sep, eq, name) {
+	  sep = sep || '&';
+	  eq = eq || '=';
 
-	          if (request.credentials === 'include') {
-	            xhr.withCredentials = true;
-	          } else if (request.credentials === 'omit') {
-	            xhr.withCredentials = false;
-	          }
+	  if (obj === null) {
+	    obj = undefined;
+	  }
 
-	          if ('responseType' in xhr && support.blob) {
-	            xhr.responseType = 'blob';
-	          }
+	  if (typeof obj === 'object') {
+	    return Object.keys(obj).map(function (k) {
+	      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
 
-	          request.headers.forEach(function (value, name) {
-	            xhr.setRequestHeader(name, value);
-	          });
-	          xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit);
-	        });
-	      };
+	      if (Array.isArray(obj[k])) {
+	        return obj[k].map(function (v) {
+	          return ks + encodeURIComponent(stringifyPrimitive(v));
+	        }).join(sep);
+	      } else {
+	        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+	      }
+	    }).filter(Boolean).join(sep);
+	  }
 
-	      self.fetch.polyfill = true;
-	    })(typeof self !== 'undefined' ? self : this);
-	  }).call(__root__, void 0);
-	  var fetch = __root__.fetch;
-	  var Response = fetch.Response = __root__.Response;
-	  var Request = fetch.Request = __root__.Request;
-	  var Headers = fetch.Headers = __root__.Headers;
+	  if (!name) return '';
+	  return encodeURIComponent(stringifyPrimitive(name)) + eq + encodeURIComponent(stringifyPrimitive(obj));
+	};
 
-	  if ( module.exports) {
-	    module.exports = fetch; // Needed for TypeScript consumers without esModuleInterop.
+	var querystring = createCommonjsModule(function (module, exports) {
 
-	    module.exports["default"] = fetch;
-	  }
+	  exports.decode = exports.parse = decode;
+	  exports.encode = exports.stringify = encode;
 	});
+	var querystring_1 = querystring.decode;
+	var querystring_2 = querystring.parse;
+	var querystring_3 = querystring.encode;
+	var querystring_4 = querystring.stringify;
 
 	var _typeof$1 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
 	  return typeof obj;
@@ -15852,17 +15371,10 @@
 	  }
 
 	  var credentials = auth || null;
-
-	  if (!config.mongodb) {
-	    if (isAppbase(url) && credentials === null) {
-	      throw new Error('Authentication information is not present. Did you add credentials?');
-	    }
-	  }
 	  /**
 	   * Credentials can be provided as a part of the URL,
 	   * as username, password args or as a credentials argument directly */
 
-
 	  if (typeof config.credentials === 'string' && config.credentials !== '') {
 	    // eslint-disable-next-line
 	    credentials = config.credentials;
@@ -15870,6 +15382,12 @@
 	    credentials = config.username + ':' + config.password;
 	  }
 
+	  if (!config.mongodb) {
+	    if (isAppbase(url) && credentials === null) {
+	      throw new Error('Authentication information is not present. Did you add credentials?');
+	    }
+	  }
+
 	  this.url = url;
 	  this.protocol = protocol;
 	  this.app = config.app;
@@ -15967,7 +15485,7 @@
 	        var transformedRequest = Object.assign({}, ts);
 	        var url = transformedRequest.url;
 	        delete transformedRequest.url;
-	        return browserPonyfill$1(url || finalURL, Object.assign({}, transformedRequest, {
+	        return fetch$1(url || finalURL, Object.assign({}, transformedRequest, {
 	          // apply timestamp header for RS API
 	          headers: isRSAPI && !isMongoRequest ? Object.assign({}, transformedRequest.headers, {
 	            'x-timestamp': new Date().getTime()
@@ -17223,14 +16741,14 @@
 	      this.updateState(this.$props);
 	    },
 	    analyticsConfig: function analyticsConfig(newVal, oldVal) {
-	      if (!helper_20(newVal, oldVal)) {
+	      if (!helper_22(newVal, oldVal)) {
 	        if (this.store) {
 	          this.store.dispatch(analytics_3$1(newVal));
 	        }
 	      }
 	    },
 	    appbaseConfig: function appbaseConfig(newVal, oldVal) {
-	      if (!helper_20(newVal, oldVal)) {
+	      if (!helper_22(newVal, oldVal)) {
 	        if (this.store) {
 	          this.store.dispatch(analytics_3$1(newVal));
 	        }
@@ -19871,7 +19389,8 @@
 	var debounce$1 = lib_8.debounce,
 	    checkValueChange = lib_8.checkValueChange,
 	    getClassName$3 = lib_8.getClassName,
-	    getOptionsFromQuery$1 = lib_8.getOptionsFromQuery,
+	    extractQueryFromCustomQuery$1 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$1 = lib_8.getOptionsForCustomQuery,
 	    isEqual$4 = lib_8.isEqual,
 	    getCompositeAggsQuery$1 = lib_8.getCompositeAggsQuery,
 	    withClickIds = lib_8.withClickIds,
@@ -20233,7 +19752,7 @@
 	    // returns size and aggs property
 	    getBasicQueryOptions: function getBasicQueryOptions() {
 	      var aggregationField = this.$props.aggregationField;
-	      var queryOptions = helper_22(this.$props);
+	      var queryOptions = helper_24(this.$props);
 
 	      if (aggregationField) {
 	        queryOptions.aggs = getCompositeAggsQuery$1({
@@ -20329,12 +19848,13 @@
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$1(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
 	        }
 
-	        defaultQueryOptions = getOptionsFromQuery$1(defaultQueryToBeSet); // Update calculated default query in store
+	        defaultQueryOptions = getOptionsForCustomQuery$1(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
 	      }
@@ -20358,13 +19878,13 @@
 
 	      if (customQuery) {
 	        var customQueryTobeSet = customQuery(value, props);
-	        var queryTobeSet = customQueryTobeSet.query;
+	        var queryTobeSet = extractQueryFromCustomQuery$1(customQueryTobeSet);
 
 	        if (queryTobeSet) {
 	          query = queryTobeSet;
 	        }
 
-	        customQueryOptions = getOptionsFromQuery$1(customQueryTobeSet);
+	        customQueryOptions = getOptionsForCustomQuery$1(customQueryTobeSet);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	        this.setQueryOptions(componentId, _extends({}, this.queryOptions, customQueryOptions), false);
 	      }
@@ -21053,6 +20573,10 @@
 	  };
 	};
 
+	DataSearch.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$3 = function mapStateToProps(state, props) {
 	  return {
 	    selectedValue: state.selectedValues[props.componentId] && state.selectedValues[props.componentId].value || null,
@@ -21090,7 +20614,7 @@
 	};
 	var DSConnected = ComponentWrapper$1(connect(mapStateToProps$3, mapDispatchToProps$2)(DataSearch), {
 	  componentType: constants_1$1.dataSearch,
-	  internalComponent: true
+	  internalComponent: DataSearch.hasInternalComponent()
 	});
 
 	DataSearch.install = function (Vue) {
@@ -21198,8 +20722,9 @@
 	var getQueryOptions$1 = lib_8.getQueryOptions,
 	    checkValueChange$1 = lib_8.checkValueChange,
 	    getClassName$4 = lib_8.getClassName,
-	    getOptionsFromQuery$2 = lib_8.getOptionsFromQuery,
-	    isEqual$5 = lib_8.isEqual;
+	    isEqual$5 = lib_8.isEqual,
+	    extractQueryFromCustomQuery$2 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$2 = lib_8.getOptionsForCustomQuery;
 	var SingleList = {
 	  name: 'SingleList',
 	  props: {
@@ -21441,12 +20966,13 @@
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$2(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
 	        }
 
-	        defaultQueryOptions = getOptionsFromQuery$2(defaultQueryToBeSet); // Update calculated default query in store
+	        defaultQueryOptions = getOptionsForCustomQuery$2(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
 	      }
@@ -21465,10 +20991,9 @@
 	      var customQueryOptions;
 
 	      if (customQuery) {
-	        var _ref = customQuery(value, props) || {};
-
-	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$2(customQuery(value, props));
+	        var customQueryCalc = customQuery(value, props);
+	        query = extractQueryFromCustomQuery$2(customQueryCalc);
+	        customQueryOptions = getOptionsForCustomQuery$2(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	      }
 
@@ -21492,7 +21017,7 @@
 
 	      if (props.defaultQuery) {
 	        var value = this.$data.currentValue;
-	        var defaultQueryOptions = getOptionsFromQuery$2(props.defaultQuery(value, props));
+	        var defaultQueryOptions = getOptionsForCustomQuery$2(props.defaultQuery(value, props));
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
 	      } else {
 	        this.setQueryOptions(this.internalComponent, queryOptions);
@@ -21637,6 +21162,10 @@
 	  return query;
 	};
 
+	SingleList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$4 = function mapStateToProps(state, props) {
 	  return {
 	    options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -21658,7 +21187,7 @@
 	};
 	var ListConnected = ComponentWrapper$1(connect(mapStateToProps$4, mapDispatchtoProps$2)(SingleList), {
 	  componentType: constants_1$1.singleList,
-	  internalComponent: true
+	  internalComponent: SingleList.hasInternalComponent()
 	});
 
 	SingleList.install = function (Vue) {
@@ -21676,7 +21205,8 @@
 	    getQueryOptions$2 = lib_8.getQueryOptions,
 	    checkValueChange$2 = lib_8.checkValueChange,
 	    getClassName$5 = lib_8.getClassName,
-	    getOptionsFromQuery$3 = lib_8.getOptionsFromQuery;
+	    extractQueryFromCustomQuery$3 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$3 = lib_8.getOptionsForCustomQuery;
 	var MultiList = {
 	  name: 'MultiList',
 	  props: {
@@ -21995,12 +21525,13 @@
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$3(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
 	        }
 
-	        defaultQueryOptions = getOptionsFromQuery$3(defaultQueryToBeSet); // Update calculated default query in store
+	        defaultQueryOptions = getOptionsForCustomQuery$3(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
 	      }
@@ -22019,10 +21550,9 @@
 	      var customQueryOptions;
 
 	      if (customQuery) {
-	        var _ref = customQuery(value, props) || {};
-
-	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$3(customQuery(value, props));
+	        var customQueryCalc = customQuery(value, props);
+	        query = extractQueryFromCustomQuery$3(customQueryCalc);
+	        customQueryOptions = getOptionsForCustomQuery$3(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	      }
 
@@ -22046,7 +21576,7 @@
 
 	      if (props.defaultQuery) {
 	        var value = Object.keys(this.$data.currentValue);
-	        var defaultQueryOptions = getOptionsFromQuery$3(props.defaultQuery(value, props));
+	        var defaultQueryOptions = getOptionsForCustomQuery$3(props.defaultQuery(value, props));
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
 	      } else {
 	        this.setQueryOptions(this.internalComponent, queryOptions);
@@ -22155,12 +21685,12 @@
 
 	    if (props.queryFormat === 'or') {
 	      if (props.showMissing) {
-	        var _type, _ref2;
+	        var _type, _ref;
 
 	        var hasMissingTerm = value.includes(props.missingLabel);
-	        var should = [(_ref2 = {}, _ref2[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
+	        var should = [(_ref = {}, _ref[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
 	          return item !== props.missingLabel;
-	        }), _type), _ref2)];
+	        }), _type), _ref)];
 
 	        if (hasMissingTerm) {
 	          should = should.concat({
@@ -22187,9 +21717,9 @@
 	    } else {
 	      // adds a sub-query with must as an array of objects for each term/value
 	      var queryArray = value.map(function (item) {
-	        var _type3, _ref3;
+	        var _type3, _ref2;
 
-	        return _ref3 = {}, _ref3[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref3;
+	        return _ref2 = {}, _ref2[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref2;
 	      });
 	      listQuery = {
 	        bool: {
@@ -22239,9 +21769,14 @@
 	  setCustomQuery: setCustomQuery$2,
 	  setDefaultQuery: setDefaultQuery$3
 	};
+
+	MultiList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var ListConnected$1 = ComponentWrapper$1(connect(mapStateToProps$5, mapDispatchtoProps$3)(MultiList), {
 	  componentType: constants_1$1.multiList,
-	  internalComponent: true
+	  internalComponent: MultiList.hasInternalComponent()
 	});
 
 	MultiList.install = function (Vue) {
@@ -22568,9 +22103,10 @@
 	    checkValueChange$3 = lib_8.checkValueChange,
 	    checkPropChange$1 = lib_8.checkPropChange,
 	    getClassName$7 = lib_8.getClassName,
-	    getOptionsFromQuery$4 = lib_8.getOptionsFromQuery,
 	    isEqual$7 = lib_8.isEqual,
-	    getCompositeAggsQuery$2 = lib_8.getCompositeAggsQuery;
+	    getCompositeAggsQuery$2 = lib_8.getCompositeAggsQuery,
+	    extractQueryFromCustomQuery$4 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$4 = lib_8.getOptionsForCustomQuery;
 	var SingleDropdownList = {
 	  name: 'SingleDropdownList',
 	  data: function data() {
@@ -22824,12 +22360,13 @@
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$4(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
 	        }
 
-	        defaultQueryOptions = getOptionsFromQuery$4(defaultQueryToBeSet); // Update calculated default query in store
+	        defaultQueryOptions = getOptionsForCustomQuery$4(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
 	      }
@@ -22848,10 +22385,9 @@
 	      var customQueryOptions;
 
 	      if (customQuery) {
-	        var _ref = customQuery(value, props) || {};
-
-	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$4(customQuery(value, props));
+	        var customQueryCalc = customQuery(value, props);
+	        query = extractQueryFromCustomQuery$4(customQueryCalc);
+	        customQueryOptions = getOptionsForCustomQuery$4(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	      }
 
@@ -22889,7 +22425,7 @@
 
 	      if (props.defaultQuery) {
 	        var value = this.$data.currentValue;
-	        var defaultQueryOptions = getOptionsFromQuery$4(props.defaultQuery(value, props));
+	        var defaultQueryOptions = getOptionsForCustomQuery$4(props.defaultQuery(value, props));
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
 	      } else {
 	        this.setQueryOptions(this.internalComponent, queryOptions);
@@ -22981,6 +22517,10 @@
 	  }) : getAggsQuery(queryOptions, props);
 	};
 
+	SingleDropdownList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$6 = function mapStateToProps(state, props) {
 	  return {
 	    options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -23002,7 +22542,7 @@
 	};
 	var ListConnected$2 = ComponentWrapper$1(connect(mapStateToProps$6, mapDispatchtoProps$4)(SingleDropdownList), {
 	  componentType: constants_1$1.singleDropdownList,
-	  internalComponent: true
+	  internalComponent: SingleDropdownList.hasInternalComponent()
 	});
 
 	SingleDropdownList.install = function (Vue) {
@@ -23021,8 +22561,9 @@
 	    checkValueChange$4 = lib_8.checkValueChange,
 	    checkPropChange$2 = lib_8.checkPropChange,
 	    getClassName$8 = lib_8.getClassName,
-	    getOptionsFromQuery$5 = lib_8.getOptionsFromQuery,
-	    getCompositeAggsQuery$3 = lib_8.getCompositeAggsQuery;
+	    getCompositeAggsQuery$3 = lib_8.getCompositeAggsQuery,
+	    extractQueryFromCustomQuery$5 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$5 = lib_8.getOptionsForCustomQuery;
 	var MultiDropdownList = {
 	  name: 'MultiDropdownList',
 	  data: function data() {
@@ -23351,12 +22892,13 @@
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$5(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
 	        }
 
-	        defaultQueryOptions = getOptionsFromQuery$5(defaultQueryToBeSet); // Update calculated default query in store
+	        defaultQueryOptions = getOptionsForCustomQuery$5(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
 	      }
@@ -23375,10 +22917,9 @@
 	      var customQueryOptions;
 
 	      if (customQuery) {
-	        var _ref = customQuery(value, props) || {};
-
-	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$5(customQuery(value, props));
+	        var customQueryCalc = customQuery(value, props);
+	        query = extractQueryFromCustomQuery$5(customQueryCalc);
+	        customQueryOptions = getOptionsForCustomQuery$5(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	      }
 
@@ -23416,7 +22957,7 @@
 
 	      if (props.defaultQuery) {
 	        var value = Object.keys(this.$data.currentValue);
-	        var defaultQueryOptions = getOptionsFromQuery$5(props.defaultQuery(value, props));
+	        var defaultQueryOptions = getOptionsForCustomQuery$5(props.defaultQuery(value, props));
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, defaultQueryOptions));
 	      } else {
 	        this.setQueryOptions(this.internalComponent, queryOptions);
@@ -23475,12 +23016,12 @@
 
 	    if (props.queryFormat === 'or') {
 	      if (props.showMissing) {
-	        var _type, _ref2;
+	        var _type, _ref;
 
 	        var hasMissingTerm = value.includes(props.missingLabel);
-	        var should = [(_ref2 = {}, _ref2[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
+	        var should = [(_ref = {}, _ref[type] = (_type = {}, _type[props.dataField] = value.filter(function (item) {
 	          return item !== props.missingLabel;
-	        }), _type), _ref2)];
+	        }), _type), _ref)];
 
 	        if (hasMissingTerm) {
 	          should = should.concat({
@@ -23507,9 +23048,9 @@
 	    } else {
 	      // adds a sub-query with must as an array of objects for each term/value
 	      var queryArray = value.map(function (item) {
-	        var _type3, _ref3;
+	        var _type3, _ref2;
 
-	        return _ref3 = {}, _ref3[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref3;
+	        return _ref2 = {}, _ref2[type] = (_type3 = {}, _type3[props.dataField] = item, _type3), _ref2;
 	      });
 	      listQuery = {
 	        bool: {
@@ -23544,6 +23085,10 @@
 	  }) : getAggsQuery(queryOptions, props);
 	};
 
+	MultiDropdownList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$7 = function mapStateToProps(state, props) {
 	  return {
 	    options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -23565,7 +23110,7 @@
 	};
 	var ListConnected$3 = ComponentWrapper$1(connect(mapStateToProps$7, mapDispatchtoProps$5)(MultiDropdownList), {
 	  componentType: constants_1$1.multiDropdownList,
-	  internalComponent: true
+	  internalComponent: MultiDropdownList.hasInternalComponent()
 	});
 
 	MultiDropdownList.install = function (Vue) {
@@ -23581,7 +23126,7 @@
 	var isEqual$9 = lib_8.isEqual,
 	    checkValueChange$5 = lib_8.checkValueChange,
 	    getClassName$9 = lib_8.getClassName,
-	    getOptionsFromQuery$6 = lib_8.getOptionsFromQuery,
+	    getOptionsFromQuery = lib_8.getOptionsFromQuery,
 	    handleA11yAction$1 = lib_8.handleA11yAction;
 	var ToggleButton = {
 	  name: 'ToggleButton',
@@ -23747,7 +23292,7 @@
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        this.setQueryOptions(props.componentId, getOptionsFromQuery$6(customQuery(value, props)), false);
+	        this.setQueryOptions(props.componentId, getOptionsFromQuery(customQuery(value, props)), false);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
 	      }
 
@@ -23905,10 +23450,7 @@
 
 	ToggleButton.componentType = constants_1$1.toggleButton;
 
-	var _excluded = ["options"],
-	    _excluded2 = ["query"],
-	    _excluded3 = ["query"],
-	    _excluded4 = ["query"];
+	var _excluded = ["options"];
 	var updateQuery$7 = lib_5.updateQuery,
 	    setQueryOptions$7 = lib_5.setQueryOptions,
 	    setCustomQuery$6 = lib_5.setCustomQuery,
@@ -23916,8 +23458,9 @@
 	var parseHits$1 = lib_8.parseHits,
 	    isEqual$a = lib_8.isEqual,
 	    getCompositeAggsQuery$4 = lib_8.getCompositeAggsQuery,
-	    getOptionsFromQuery$7 = lib_8.getOptionsFromQuery,
-	    getResultStats$2 = lib_8.getResultStats;
+	    getResultStats$2 = lib_8.getResultStats,
+	    extractQueryFromCustomQuery$6 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$6 = lib_8.getOptionsForCustomQuery;
 	var ReactiveComponent = {
 	  name: 'ReactiveComponent',
 	  props: {
@@ -23966,25 +23509,16 @@
 
 	    if (customQuery) {
 	      var calcCustomQuery = customQuery(this.selectedValue, props);
-
-	      var _ref = calcCustomQuery || {},
-	          query = _ref.query;
-
-	      var customQueryOptions = calcCustomQuery ? getOptionsFromQuery$7(calcCustomQuery) : null;
+	      var query = extractQueryFromCustomQuery$6(calcCustomQuery);
+	      var customQueryOptions = calcCustomQuery ? getOptionsForCustomQuery$6(calcCustomQuery) : null;
 
 	      if (customQueryOptions) {
 	        this.setQueryOptions(componentId, _extends({}, customQueryOptions, this.getAggsQuery()), false);
 	      } else this.setQueryOptions(componentId, this.getAggsQuery(), false);
 
-	      var queryToSet = query || null;
-
-	      if (calcCustomQuery && calcCustomQuery.id) {
-	        queryToSet = calcCustomQuery;
-	      }
-
 	      this.updateQuery({
 	        componentId: componentId,
-	        query: queryToSet,
+	        query: query,
 	        value: this.selectedValue || null,
 	        label: filterLabel,
 	        showFilter: showFilter,
@@ -23992,9 +23526,9 @@
 	      });
 	    }
 
-	    this.setQuery = function (_ref2) {
-	      var options = _ref2.options,
-	          obj = _objectWithoutPropertiesLoose(_ref2, _excluded);
+	    this.setQuery = function (_ref) {
+	      var options = _ref.options,
+	          obj = _objectWithoutPropertiesLoose(_ref, _excluded);
 
 	      if (options) {
 	        _this.setQueryOptions(props.componentId, _extends({}, options, _this.getAggsQuery()), false);
@@ -24004,17 +23538,17 @@
 
 	      if (obj && obj.query && obj.query.query) {
 	        queryToBeSet = obj.query.query;
-	      } // Update customQuery field for RS API
+	      }
 
+	      var customQueryCalc = _extends({}, options); // Update customQuery field for RS API
 
-	      if (obj && obj.query || options) {
-	        var customQueryCalc = _extends({}, options);
 
-	        if (obj && obj.query) {
-	          if (obj.query.id) {
+	      if (queryToBeSet || options) {
+	        if (queryToBeSet.query) {
+	          if (queryToBeSet.id) {
 	            customQueryCalc = queryToBeSet;
 	          } else {
-	            customQueryCalc.query = obj.query;
+	            customQueryCalc.query = queryToBeSet;
 	          }
 	        }
 
@@ -24022,6 +23556,7 @@
 	      }
 
 	      _this.updateQuery(_extends({}, obj, {
+	        query: customQueryCalc,
 	        componentId: props.componentId,
 	        label: props.filterLabel,
 	        showFilter: props.showFilter,
@@ -24037,24 +23572,16 @@
 	    if (this.internalComponent && this.$props.defaultQuery) {
 	      updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
 	      this.$defaultQuery = this.$props.defaultQuery(this.selectedValue, this.$props);
-
-	      var _ref3 = this.$defaultQuery || {},
-	          query = _ref3.query,
-	          queryOptions = _objectWithoutPropertiesLoose(_ref3, _excluded2);
+	      var query = extractQueryFromCustomQuery$6(this.$defaultQuery);
+	      var queryOptions = getOptionsForCustomQuery$6(this.$defaultQuery);
 
 	      if (queryOptions) {
 	        this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, this.getAggsQuery()), false);
 	      } else this.setQueryOptions(this.internalComponent, this.getAggsQuery(), false);
 
-	      var queryToSet = query || null;
-
-	      if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
-	        queryToSet = this.$defaultQuery;
-	      }
-
 	      this.updateQuery({
 	        componentId: this.internalComponent,
-	        query: queryToSet
+	        query: query
 	      });
 	    }
 	  },
@@ -24102,10 +23629,8 @@
 	    defaultQuery: function defaultQuery(newVal, oldVal) {
 	      if (newVal && !isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
 	        this.$defaultQuery = newVal(this.selectedValue, this.$props);
-
-	        var _ref4 = this.$defaultQuery || {},
-	            query = _ref4.query,
-	            queryOptions = _objectWithoutPropertiesLoose(_ref4, _excluded3);
+	        var query = extractQueryFromCustomQuery$6(this.$defaultQuery);
+	        var queryOptions = getOptionsForCustomQuery$6(this.$defaultQuery);
 
 	        if (queryOptions) {
 	          this.setQueryOptions(this.internalComponent, _extends({}, queryOptions, this.getAggsQuery()), false);
@@ -24113,15 +23638,9 @@
 
 
 	        updateDefaultQuery(this.componentId, this.setDefaultQuery, this.$props, this.selectedValue);
-	        var queryToSet = query || null;
-
-	        if (!queryToSet && this.$defaultQuery && this.$defaultQuery.id) {
-	          queryToSet = this.$defaultQuery;
-	        }
-
 	        this.updateQuery({
 	          componentId: this.internalComponent,
-	          query: queryToSet
+	          query: query
 	        });
 	      }
 	    },
@@ -24129,10 +23648,8 @@
 	      if (newVal && !isQueryIdentical(newVal, oldVal, this.selectedValue, this.$props)) {
 	        var componentId = this.$props.componentId;
 	        this.$customQuery = newVal(this.selectedValue, this.$props);
-
-	        var _ref5 = this.$customQuery || {},
-	            query = _ref5.query,
-	            queryOptions = _objectWithoutPropertiesLoose(_ref5, _excluded4);
+	        var query = extractQueryFromCustomQuery$6(this.$customQuery);
+	        var queryOptions = getOptionsForCustomQuery$6(this.$customQuery);
 
 	        if (queryOptions) {
 	          this.setQueryOptions(componentId, _extends({}, queryOptions, this.getAggsQuery()), false);
@@ -24140,15 +23657,9 @@
 
 
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.selectedValue);
-	        var queryToSet = query || null;
-
-	        if (this.$customQuery && this.$customQuery.id) {
-	          queryToSet = this.$customQuery;
-	        }
-
 	        this.updateQuery({
 	          componentId: componentId,
-	          query: queryToSet
+	          query: query
 	        });
 	      }
 	    }
@@ -24228,6 +23739,10 @@
 	  }
 	};
 
+	ReactiveComponent.hasInternalComponent = function (props) {
+	  return !!props.defaultQuery;
+	};
+
 	var mapStateToProps$9 = function mapStateToProps(state, props) {
 	  return {
 	    aggregations: state.aggregations[props.componentId] && state.aggregations[props.componentId] || null,
@@ -24434,7 +23949,7 @@
 	var isEqual$b = lib_8.isEqual,
 	    checkValueChange$6 = lib_8.checkValueChange,
 	    getClassName$b = lib_8.getClassName,
-	    getOptionsFromQuery$8 = lib_8.getOptionsFromQuery;
+	    getOptionsFromQuery$1 = lib_8.getOptionsFromQuery;
 	var SingleRange = {
 	  name: 'SingleRange',
 	  data: function data() {
@@ -24570,7 +24085,7 @@
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$8(customQuery(value, props));
+	        customQueryOptions = getOptionsFromQuery$1(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
 	      }
 
@@ -24662,7 +24177,7 @@
 	var isEqual$c = lib_8.isEqual,
 	    checkValueChange$7 = lib_8.checkValueChange,
 	    getClassName$c = lib_8.getClassName,
-	    getOptionsFromQuery$9 = lib_8.getOptionsFromQuery;
+	    getOptionsFromQuery$2 = lib_8.getOptionsFromQuery;
 	var MultiRange = {
 	  name: 'MultiRange',
 	  data: function data() {
@@ -24779,7 +24294,7 @@
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$9(customQuery(value, props));
+	        customQueryOptions = getOptionsFromQuery$2(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
 	      }
 
@@ -25274,7 +24789,7 @@
 	    setCustomQuery$9 = lib_5.setCustomQuery;
 	var checkValueChange$8 = lib_8.checkValueChange,
 	    getClassName$d = lib_8.getClassName,
-	    getOptionsFromQuery$a = lib_8.getOptionsFromQuery,
+	    getOptionsFromQuery$3 = lib_8.getOptionsFromQuery,
 	    isEqual$d = lib_8.isEqual;
 	var RangeSlider = {
 	  name: 'RangeSlider',
@@ -25370,7 +24885,7 @@
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$a(customQuery(value, props));
+	        customQueryOptions = getOptionsFromQuery$3(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
 	      }
 
@@ -25556,9 +25071,10 @@
 	    updateComponentProps$2 = lib_5.updateComponentProps;
 	var checkValueChange$9 = lib_8.checkValueChange,
 	    getClassName$e = lib_8.getClassName,
-	    getOptionsFromQuery$b = lib_8.getOptionsFromQuery,
 	    isEqual$e = lib_8.isEqual,
-	    checkSomePropChange$1 = lib_8.checkSomePropChange;
+	    checkSomePropChange$1 = lib_8.checkSomePropChange,
+	    extractQueryFromCustomQuery$7 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$7 = lib_8.getOptionsForCustomQuery;
 	var DynamicRangeSlider = {
 	  name: 'DynamicRangeSlider',
 	  components: getComponents(),
@@ -25769,19 +25285,23 @@
 	      var customQueryOptions;
 
 	      if (this.$props.customQuery) {
-	        var _ref2 = this.$props.customQuery(value, this.$props) || {};
+	        var customQueryTobeSet = this.$props.customQuery(value, this.$props);
+	        var queryTobeSet = extractQueryFromCustomQuery$7(customQueryTobeSet);
+
+	        if (queryTobeSet) {
+	          query = queryTobeSet;
+	        }
 
-	        query = _ref2.query;
-	        customQueryOptions = getOptionsFromQuery$b(this.$props.customQuery(value, this.$props));
+	        customQueryOptions = getOptionsForCustomQuery$7(customQueryTobeSet);
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
 	      }
 
-	      var _ref3 = this.range || {
+	      var _ref2 = this.range || {
 	        start: value[0],
 	        end: value[1]
 	      },
-	          start = _ref3.start,
-	          end = _ref3.end;
+	          start = _ref2.start,
+	          end = _ref2.end;
 
 	      var currentStart = value[0],
 	          currentEnd = value[1]; // check if the slider is at its initial position
@@ -25834,13 +25354,13 @@
 	    range: function range(newValue, oldValue) {
 	      if (isEqual$e(newValue, oldValue) || !this.currentValue) return;
 
-	      var _ref4 = this.currentValue || [],
-	          currentStart = _ref4[0],
-	          currentEnd = _ref4[1];
+	      var _ref3 = this.currentValue || [],
+	          currentStart = _ref3[0],
+	          currentEnd = _ref3[1];
 
-	      var _ref5 = oldValue || {},
-	          oldStart = _ref5.start,
-	          oldEnd = _ref5.end;
+	      var _ref4 = oldValue || {},
+	          oldStart = _ref4.start,
+	          oldEnd = _ref4.end;
 
 	      var newStart = currentStart === oldStart ? newValue.start : currentStart;
 	      var newEnd = currentEnd === oldEnd ? newValue.end : currentEnd;
@@ -25935,6 +25455,10 @@
 	  return [];
 	};
 
+	DynamicRangeSlider.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$e = function mapStateToProps(state, props) {
 	  var componentId = state.aggregations[props.componentId];
 	  var internalRange = state.aggregations[props.componentId + "__range__internal"];
@@ -29279,7 +28803,7 @@
 	    getQueryOptions$5 = lib_8.getQueryOptions,
 	    getClassName$f = lib_8.getClassName,
 	    parseHits$2 = lib_8.parseHits,
-	    getOptionsFromQuery$c = lib_8.getOptionsFromQuery,
+	    getOptionsFromQuery$4 = lib_8.getOptionsFromQuery,
 	    getResultStats$3 = lib_8.getResultStats; // default map center
 
 	var MAP_CENTER = {
@@ -29450,10 +28974,10 @@
 	          options.sort = this.$defaultQuery.sort;
 	        }
 
-	        var queryOptions = getOptionsFromQuery$c(this.$defaultQuery);
+	        var queryOptions = getOptionsFromQuery$4(this.$defaultQuery);
 
 	        if (queryOptions) {
-	          options = _extends({}, options, getOptionsFromQuery$c(this.$defaultQuery));
+	          options = _extends({}, options, getOptionsFromQuery$4(this.$defaultQuery));
 	        } // Update calculated default query in store
 
 
@@ -30045,7 +29569,7 @@
 
 	    if (this.$props.defaultQuery) {
 	      this.$defaultQuery = this.$props.defaultQuery();
-	      options = _extends({}, options, getOptionsFromQuery$c(this.$defaultQuery)); // Override sort query with defaultQuery's sort if defined
+	      options = _extends({}, options, getOptionsFromQuery$4(this.$defaultQuery)); // Override sort query with defaultQuery's sort if defined
 
 	      if (this.$defaultQuery.sort) {
 	        options.sort = this.$defaultQuery.sort;
@@ -32953,10 +32477,9 @@
 
 	ReactiveGoogleMap.componentType = constants_1$1.reactiveMap;
 
-	var _excluded$5 = ["aggs", "size"];
+	var _excluded$5 = ["aggs", "size"],
+	    _excluded2 = ["query"];
 	var X_SEARCH_CLIENT$1 = 'ReactiveSearch Vue';
-	var componentsWithHighlightQuery = [constants_1$1.dataSearch, constants_1$1.categorySearch];
-	var componentsWithOptions = [constants_1$1.reactiveList, constants_1$1.reactiveMap, constants_1$1.singleList, constants_1$1.multiList, constants_1$1.tagCloud].concat(componentsWithHighlightQuery);
 	var componentsWithoutFilters = [constants_1$1.numberBox, constants_1$1.ratingsFilter];
 	var resultComponents = [constants_1$1.reactiveList, constants_1$1.reactiveMap];
 
@@ -32990,23 +32513,35 @@
 	  }
 
 	  return value;
-	}
+	} // Returns query DSL with query property and other options
+
+
+	function getDefaultQuery(component, value) {
+	  // get custom or default query of sensor components
+	  var currentValue = parseValue(value, component); // get default query of result components
+
+	  if (component.defaultQuery) {
+	    var defaultQuery = component.defaultQuery(currentValue, component);
+	    return _extends({
+	      query: helper_11(defaultQuery)
+	    }, helper_12(defaultQuery));
+	  }
 
-	function getQuery(component, value, componentType) {
-	  // get default query of result components
-	  if (resultComponents.includes(componentType)) {
-	    return component.defaultQuery ? component.defaultQuery() : {};
-	  } // get custom or default query of sensor components
+	  return component.source.defaultQuery ? {
+	    query: component.source.defaultQuery(currentValue, component)
+	  } : {};
+	} // Only results the query part
 
 
+	function getCustomQuery(component, value) {
+	  // get custom or default query of sensor components
 	  var currentValue = parseValue(value, component);
 
 	  if (component.customQuery) {
-	    var customQuery = component.customQuery(currentValue, component);
-	    return customQuery && customQuery.query;
+	    return helper_11(component.customQuery(currentValue, component));
 	  }
 
-	  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : {};
+	  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : null;
 	}
 
 	function initReactivesearch(componentCollection, searchState, settings) {
@@ -33061,6 +32596,11 @@
 	        }
 	      });
 	      var isInternalComponentPresent = false;
+
+	      if (component.source.hasInternalComponent) {
+	        isInternalComponentPresent = component.source.hasInternalComponent(component);
+	      }
+
 	      var isResultComponent = resultComponents.includes(componentType);
 	      var internalComponent = component.componentId + "__internal";
 	      var label = component.filterLabel || component.componentId;
@@ -33092,74 +32632,66 @@
 
 	      if (component.defaultQuery && typeof component.defaultQuery === 'function') {
 	        defaultQueries[component.componentId] = component.defaultQuery(value, compProps);
-	      } // [2] set query options - main component query (valid for result components)
-
-
-	      if (componentsWithOptions.includes(componentType)) {
-	        var options = component.source.generateQueryOptions ? component.source.generateQueryOptions(component) : null;
-	        var highlightQuery = {};
-
-	        if (componentsWithHighlightQuery.includes(componentType) && component.highlight) {
-	          highlightQuery = component.source.highlightQuery(component);
-	        }
+	      }
 
-	        if (options && Object.keys(options).length || highlightQuery && Object.keys(highlightQuery).length) {
-	          // eslint-disable-next-line
-	          var _ref = options || {},
-	              aggs = _ref.aggs,
-	              size = _ref.size,
-	              otherQueryOptions = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+	      var componentQueryOptions = {}; // [2] set query options - main component query (valid for result components)
 
-	          if (aggs && Object.keys(aggs).length) {
-	            isInternalComponentPresent = true; // query should be applied on the internal component
-	            // to enable feeding the data to parent component
+	      if (component && component.source.generateQueryOptions) {
+	        componentQueryOptions = _extends({}, componentQueryOptions, component.source.generateQueryOptions(component));
+	      }
 
-	            queryOptions = queryOptionsReducer(queryOptions, {
-	              type: 'SET_QUERY_OPTIONS',
-	              component: internalComponent,
-	              options: {
-	                aggs: aggs,
-	                size: typeof size === 'undefined' ? 100 : size
-	              }
-	            });
-	          } // sort, highlight, size, from - query should be applied on the main component
+	      var highlightQuery = {};
 
+	      if (component.source.highlightQuery) {
+	        highlightQuery = component.source.highlightQuery(component);
+	      }
 
-	          if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
-	            if (!otherQueryOptions) otherQueryOptions = {};
-	            if (!highlightQuery) highlightQuery = {};
+	      if (componentQueryOptions && Object.keys(componentQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+	        // eslint-disable-next-line
+	        var _ref = componentQueryOptions || {},
+	            aggs = _ref.aggs,
+	            size = _ref.size,
+	            otherQueryOptions = _objectWithoutPropertiesLoose(_ref, _excluded$5);
+
+	        if (aggs && Object.keys(aggs).length) {
+	          isInternalComponentPresent = true;
+	          componentQueryOptions = _extends({}, componentQueryOptions, {
+	            aggs: aggs,
+	            size: typeof size === 'undefined' ? 100 : size
+	          });
+	        } // sort, highlight, size, from - query should be applied on the main component
 
-	            var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
-	              size: size
-	            });
 
-	            if (isInternalComponentPresent) {
-	              mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
-	            }
+	        if (otherQueryOptions && Object.keys(otherQueryOptions).length || highlightQuery && Object.keys(highlightQuery).length) {
+	          if (!otherQueryOptions) otherQueryOptions = {};
+	          if (!highlightQuery) highlightQuery = {};
 
-	            if (isResultComponent) {
-	              var currentPage = component.currentPage ? component.currentPage - 1 : 0;
+	          var mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery, {
+	            size: size
+	          });
 
-	              if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
-	                currentPage = selectedValues[component.componentId].value - 1 || 0;
-	              }
+	          if (isInternalComponentPresent) {
+	            mainQueryOptions = _extends({}, otherQueryOptions, highlightQuery);
+	          }
 
-	              var resultSize = component.size || 10;
-	              var from = currentPage * resultSize; // Update props for RS API
+	          if (isResultComponent) {
+	            var currentPage = component.currentPage ? component.currentPage - 1 : 0;
 
-	              compProps.from = from;
-	              mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
-	                size: resultSize,
-	                from: from
-	              });
+	            if (selectedValues[component.componentId] && selectedValues[component.componentId].value) {
+	              currentPage = selectedValues[component.componentId].value - 1 || 0;
 	            }
 
-	            queryOptions = queryOptionsReducer(queryOptions, {
-	              type: 'SET_QUERY_OPTIONS',
-	              component: component.componentId,
-	              options: _extends({}, mainQueryOptions)
+	            var resultSize = component.size || 10;
+	            var from = currentPage * resultSize; // Update props for RS API
+
+	            compProps.from = from;
+	            mainQueryOptions = _extends({}, mainQueryOptions, highlightQuery, {
+	              size: resultSize,
+	              from: from
 	            });
 	          }
+
+	          componentQueryOptions = _extends({}, componentQueryOptions, mainQueryOptions);
 	        }
 	      } // [3] set dependency tree
 
@@ -33168,7 +32700,7 @@
 	        var react = component.react;
 
 	        if (isInternalComponentPresent || isResultComponent) {
-	          react = helper_24(react, internalComponent);
+	          react = helper_26(react, internalComponent);
 	        }
 
 	        dependencyTree = dependencyTreeReducer(dependencyTree, {
@@ -33179,23 +32711,32 @@
 	      } // [4] set query list
 
 
-	      if (isResultComponent) {
-	        var _getQuery = getQuery(component, value, componentType),
-	            query = _getQuery.query;
+	      var _ref2 = getDefaultQuery(component, value) || {},
+	          defaultQuery = _ref2.query,
+	          defaultQueryOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
-	        queryList = queryReducer(queryList, {
-	          type: 'SET_QUERY',
-	          component: internalComponent,
-	          query: query
-	        });
-	      } else {
-	        queryList = queryReducer(queryList, {
-	          type: 'SET_QUERY',
-	          component: component.componentId,
-	          query: getQuery(component, value, componentType)
-	        });
-	      } // Set component type in component props
+	      queryList = queryReducer(queryList, {
+	        type: 'SET_QUERY',
+	        component: internalComponent,
+	        query: defaultQuery
+	      });
+	      queryOptions = queryOptionsReducer(queryOptions, {
+	        type: 'SET_QUERY_OPTIONS',
+	        component: internalComponent,
+	        options: _extends({}, componentQueryOptions, defaultQueryOptions)
+	      });
+	      var customQuery = getCustomQuery(component, value); // set custom query for main component
 
+	      queryList = queryReducer(queryList, {
+	        type: 'SET_QUERY',
+	        component: component.componentId,
+	        query: customQuery
+	      });
+	      queryOptions = queryOptionsReducer(queryOptions, {
+	        type: 'SET_QUERY_OPTIONS',
+	        component: component.componentId,
+	        options: _extends({}, componentQueryOptions)
+	      }); // Set component type in component props
 
 	      compProps.componentType = componentType;
 	      componentProps[component.componentId] = compProps;
@@ -33214,7 +32755,7 @@
 
 	    componentCollection.forEach(function (component) {
 	      // eslint-disable-next-line
-	      var _buildQuery = helper_23(component.componentId, dependencyTree, queryList, queryOptions),
+	      var _buildQuery = helper_25(component.componentId, dependencyTree, queryList, queryOptions),
 	          queryObj = _buildQuery.queryObj,
 	          options = _buildQuery.options;
 
@@ -33423,7 +32964,7 @@
 	  });
 	}
 
-	var version = "1.16.0-alpha.36";
+	var version = "1.16.0-alpha.37";
 
 	var _templateObject$o, _templateObject2$b;