@appbaseio/reactivesearch-vue 1.27.0-gamma.3 → 1.29.0

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

@@ -820,6 +820,9 @@
 	  var RECENT_SEARCHES_ERROR = exports.RECENT_SEARCHES_ERROR = 'RECENT_SEARCHES_ERROR';
 	  var SET_VALUE = exports.SET_VALUE = 'SET_VALUE';
 	  var RESET_TO_DEFAULT = exports.RESET_TO_DEFAULT = 'RESET_TO_DEFAULT';
+	  var SET_GOOGLE_MAP_SCRIPT_LOADING = exports.SET_GOOGLE_MAP_SCRIPT_LOADING = 'SET_GOOGLE_MAP_SCRIPT_LOADING';
+	  var SET_GOOGLE_MAP_SCRIPT_LOADED = exports.SET_GOOGLE_MAP_SCRIPT_LOADED = 'SET_GOOGLE_MAP_SCRIPT_LOADED';
+	  var SET_GOOGLE_MAP_SCRIPT_ERROR = exports.SET_GOOGLE_MAP_SCRIPT_ERROR = 'SET_GOOGLE_MAP_SCRIPT_ERROR';
 	});
 	unwrapExports(constants);
 	var constants_1 = constants.ADD_COMPONENT;
@@ -867,6 +870,9 @@
 	var constants_43 = constants.RECENT_SEARCHES_ERROR;
 	var constants_44 = constants.SET_VALUE;
 	var constants_45 = constants.RESET_TO_DEFAULT;
+	var constants_46 = constants.SET_GOOGLE_MAP_SCRIPT_LOADING;
+	var constants_47 = constants.SET_GOOGLE_MAP_SCRIPT_LOADED;
+	var constants_48 = constants.SET_GOOGLE_MAP_SCRIPT_ERROR;
 
 	var componentsReducer_1 = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -1729,17 +1735,25 @@
 
 	      case constants.CLEAR_VALUES:
 	        {
+	          var nextState = {};
+
 	          if (action.resetValues) {
-	            var nextState = {};
 	            Object.keys(action.resetValues).forEach(function (componentId) {
 	              nextState[componentId] = _extends({}, state[componentId], {
 	                value: action.resetValues[componentId]
 	              });
 	            });
-	            return nextState;
 	          }
 
-	          return {};
+	          if (Array.isArray(action.clearAllBlacklistComponents)) {
+	            Object.keys(state).forEach(function (componentId) {
+	              if (action.clearAllBlacklistComponents.includes(componentId)) {
+	                nextState[componentId] = state[componentId];
+	              }
+	            });
+	          }
+
+	          return nextState;
 	        }
 
 	      case constants.REMOVE_COMPONENT:
@@ -1822,7 +1836,30 @@
 	        }));
 
 	      case constants.CLEAR_VALUES:
-	        return {};
+	        {
+	          var nextState = {};
+
+	          if (action.resetValues) {
+	            Object.keys(action.resetValues).forEach(function (componentId) {
+	              nextState[componentId] = _extends({}, state[componentId], {
+	                value: action.resetValues[componentId]
+	              });
+	            });
+	          }
+
+	          if (Array.isArray(action.clearAllBlacklistComponents)) {
+	            Object.keys(state).forEach(function (componentId) {
+	              if (action.clearAllBlacklistComponents.includes(componentId)) {
+	                nextState[componentId] = state[componentId];
+	              }
+	            });
+	          }
+
+	          return nextState;
+	        }
+
+	      case constants.RESET_TO_DEFAULT:
+	        return _extends({}, state, action.defaultValues);
 
 	      case constants.REMOVE_COMPONENT:
 	        {
@@ -3167,6 +3204,59 @@
 	});
 	unwrapExports(recentSearches);
 
+	var googleMapScriptReducer_1 = createCommonjsModule(function (module, exports) {
+	  Object.defineProperty(exports, "__esModule", {
+	    value: true
+	  });
+
+	  var _extends = Object.assign || function (target) {
+	    for (var i = 1; i < arguments.length; i++) {
+	      var source = arguments[i];
+
+	      for (var key in source) {
+	        if (Object.prototype.hasOwnProperty.call(source, key)) {
+	          target[key] = source[key];
+	        }
+	      }
+	    }
+
+	    return target;
+	  };
+
+	  exports["default"] = googleMapScriptReducer;
+	  var INITIAL_STATE = {
+	    loading: false,
+	    loaded: false,
+	    error: null
+	  };
+
+	  function googleMapScriptReducer() {
+	    var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : INITIAL_STATE;
+	    var action = arguments[1];
+	    var type = action.type,
+	        loading = action.loading,
+	        loaded = action.loaded,
+	        error = action.error;
+
+	    if (type === constants.SET_GOOGLE_MAP_SCRIPT_LOADING) {
+	      return _extends({}, INITIAL_STATE, {
+	        loading: loading
+	      });
+	    } else if (type === constants.SET_GOOGLE_MAP_SCRIPT_LOADED) {
+	      return _extends({}, INITIAL_STATE, {
+	        loaded: loaded
+	      });
+	    } else if (type === constants.SET_GOOGLE_MAP_SCRIPT_ERROR) {
+	      return _extends({}, INITIAL_STATE, {
+	        error: error
+	      });
+	    }
+
+	    return state;
+	  }
+	});
+	unwrapExports(googleMapScriptReducer_1);
+
 	var reducers = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
 	    value: true
@@ -3238,6 +3328,8 @@
 
 	  var _recentSearches2 = _interopRequireDefault(recentSearches);
 
+	  var _googleMapScriptReducer2 = _interopRequireDefault(googleMapScriptReducer_1);
+
 	  function _interopRequireDefault(obj) {
 	    return obj && obj.__esModule ? obj : {
 	      "default": obj
@@ -3281,7 +3373,8 @@
 	    urlValues: function urlValues() {
 	      var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	      return state;
-	    }
+	    },
+	    googleMapScriptStatus: _googleMapScriptReducer2["default"]
 	  });
 	});
 	unwrapExports(reducers);
@@ -4861,7 +4954,7 @@
 	  Object.defineProperty(exports, "__esModule", {
 	    value: true
 	  });
-	  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.hasCustomRenderer = exports.getComponent = exports.isFunction = 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++) {
@@ -4878,6 +4971,7 @@
 	  };
 
 	  exports.isEqual = isEqual;
+	  exports.compareQueries = compareQueries;
 	  exports.debounce = debounce;
 	  exports.getQueryOptions = getQueryOptions;
 	  exports.buildQuery = buildQuery;
@@ -4972,6 +5066,14 @@
 	    return true;
 	  }
 
+	  function compareQueries(x, y) {
+	    try {
+	      return isEqual(JSON.parse(JSON.stringify(x)), JSON.parse(JSON.stringify(y)));
+	    } catch (e) {
+	      return false;
+	    }
+	  }
+
 	  function debounce(callback, wait) {
 	    var context = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this;
 	    var timeout = null;
@@ -5053,7 +5155,9 @@
 	          if (typeof comp !== 'string') {
 	            return getQuery(comp, queryList);
 	          } else if (comp in queryList) {
-	            return queryList[comp];
+	            if (queryList[comp] && Object.keys(queryList[comp]).length) {
+	              return queryList[comp];
+	            }
 	          }
 
 	          return null;
@@ -5062,7 +5166,7 @@
 	        });
 	        var boolQuery = createBoolQuery(operation, queryArr);
 
-	        if (boolQuery) {
+	        if (boolQuery && Object.keys(boolQuery).length) {
 	          query = [].concat(_toConsumableArray(query), [boolQuery]);
 	        }
 	      } else if (typeof react[conjunction] === 'string') {
@@ -5070,13 +5174,13 @@
 
 	        var _boolQuery = createBoolQuery(_operation, queryList[react[conjunction]]);
 
-	        if (_boolQuery) {
+	        if (_boolQuery && Object.keys(_boolQuery).length) {
 	          query = [].concat(_toConsumableArray(query), [_boolQuery]);
 	        }
 	      } else if (typeof react[conjunction] === 'object' && react[conjunction] !== null) {
 	        var _boolQuery2 = getQuery(react[conjunction], queryList);
 
-	        if (_boolQuery2) {
+	        if (_boolQuery2 && Object.keys(_boolQuery2).length) {
 	          query = [].concat(_toConsumableArray(query), [_boolQuery2]);
 	        }
 	      }
@@ -5194,7 +5298,7 @@
 	    }
 
 	    return {
-	      _term: sortBy
+	      _key: sortBy
 	    };
 	  }
 
@@ -5307,6 +5411,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] || {},
@@ -5682,38 +5818,112 @@
 	    Recent: 'recent',
 	    Promoted: 'promoted'
 	  };
+	  var queryFormatMillisecondsMap = exports.queryFormatMillisecondsMap = {
+	    minute: 60000,
+	    hour: 3600000,
+	    day: 86400000,
+	    week: 604800000,
+	    month: 2629746000,
+	    quarter: 7889238000,
+	    year: 31556952000
+	  };
+
+	  var getCalendarIntervalErrorMessage = exports.getCalendarIntervalErrorMessage = function getCalendarIntervalErrorMessage(totalRange) {
+	    var calendarInterval = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'minute';
+	    var queryFormatMillisecondsMapKeys = Object.keys(queryFormatMillisecondsMap);
+	    var indexOfCurrentCalendarInterval = queryFormatMillisecondsMapKeys.indexOf(calendarInterval);
+
+	    if (indexOfCurrentCalendarInterval === -1) {
+	      console.error('Invalid calendarInterval Passed');
+	    }
+
+	    if (calendarInterval === 'year') {
+	      return 'Try using a shorter range of values.';
+	    }
+
+	    for (var index = indexOfCurrentCalendarInterval + 1; index < queryFormatMillisecondsMapKeys.length; index += 1) {
+	      if (totalRange / Object.values(queryFormatMillisecondsMap)[index] <= 100) {
+	        var calendarIntervalKey = queryFormatMillisecondsMapKeys[index];
+	        return {
+	          errorMessage: 'Please pass calendarInterval prop with value greater than or equal to a `' + calendarIntervalKey + '` for a meaningful resolution of histogram.',
+	          calculatedCalendarInterval: calendarIntervalKey
+	        };
+	      }
+	    }
+
+	    return {
+	      errorMessage: 'Try using a shorter range of values.',
+	      calculatedCalendarInterval: 'year'
+	    };
+	  };
+
+	  var isFunction = exports.isFunction = function isFunction(element) {
+	    return typeof element === 'function';
+	  };
+
+	  var getComponent = exports.getComponent = function getComponent() {
+	    var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	    var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	    var children = props.children,
+	        render = props.render;
+
+	    if (isFunction(children)) {
+	      return children(data);
+	    }
+
+	    if (isFunction(render)) {
+	      return render(data);
+	    }
+
+	    return null;
+	  };
+
+	  var hasCustomRenderer = exports.hasCustomRenderer = function hasCustomRenderer() {
+	    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	    var render = props.render,
+	        children = props.children;
+	    return isFunction(children) || isFunction(render);
+	  };
 	});
 	unwrapExports(helper);
-	var helper_1 = helper.suggestionTypes;
-	var helper_2 = helper.getTopSuggestions;
-	var helper_3 = helper.withClickIds;
-	var helper_4 = helper.getCompositeAggsQuery;
-	var helper_5 = helper.getAggsQuery;
-	var helper_6 = helper.extractQueryFromDefaultQuery;
-	var helper_7 = helper.updateInternalQuery;
-	var helper_8 = helper.getSearchState;
-	var helper_9 = helper.getOptionsFromQuery;
-	var helper_10 = helper.parseHits;
-	var helper_11 = helper.handleA11yAction;
-	var helper_12 = helper.getInnerKey;
-	var helper_13 = helper.getClassName;
-	var helper_14 = helper.checkSomePropChange;
-	var helper_15 = helper.checkPropChange;
-	var helper_16 = helper.updateDefaultQuery;
-	var helper_17 = helper.updateCustomQuery;
-	var helper_18 = helper.isEqual;
-	var helper_19 = helper.debounce;
-	var helper_20 = helper.getQueryOptions;
-	var helper_21 = helper.buildQuery;
-	var helper_22 = helper.pushToAndClause;
-	var helper_23 = helper.checkValueChange;
-	var helper_24 = helper.getAggsOrder;
-	var helper_25 = helper.formatDate;
-	var helper_26 = helper.getResultStats;
-	var helper_27 = helper.extractFieldsFromSource;
-	var helper_28 = helper.normalizeDataField;
-	var helper_29 = helper.handleOnSuggestions;
-	var helper_30 = helper.isValidDateRangeQueryFormat;
+	var helper_1 = helper.hasCustomRenderer;
+	var helper_2 = helper.getComponent;
+	var helper_3 = helper.isFunction;
+	var helper_4 = helper.getCalendarIntervalErrorMessage;
+	var helper_5 = helper.queryFormatMillisecondsMap;
+	var helper_6 = helper.suggestionTypes;
+	var helper_7 = helper.getTopSuggestions;
+	var helper_8 = helper.withClickIds;
+	var helper_9 = helper.getCompositeAggsQuery;
+	var helper_10 = helper.getAggsQuery;
+	var helper_11 = helper.extractQueryFromDefaultQuery;
+	var helper_12 = helper.updateInternalQuery;
+	var helper_13 = helper.getSearchState;
+	var helper_14 = helper.extractQueryFromCustomQuery;
+	var helper_15 = helper.getOptionsForCustomQuery;
+	var helper_16 = helper.getOptionsFromQuery;
+	var helper_17 = helper.parseHits;
+	var helper_18 = helper.handleA11yAction;
+	var helper_19 = helper.getInnerKey;
+	var helper_20 = helper.getClassName;
+	var helper_21 = helper.checkSomePropChange;
+	var helper_22 = helper.checkPropChange;
+	var helper_23 = helper.updateDefaultQuery;
+	var helper_24 = helper.updateCustomQuery;
+	var helper_25 = helper.isEqual;
+	var helper_26 = helper.compareQueries;
+	var helper_27 = helper.debounce;
+	var helper_28 = helper.getQueryOptions;
+	var helper_29 = helper.buildQuery;
+	var helper_30 = helper.pushToAndClause;
+	var helper_31 = helper.checkValueChange;
+	var helper_32 = helper.getAggsOrder;
+	var helper_33 = helper.formatDate;
+	var helper_34 = helper.getResultStats;
+	var helper_35 = helper.extractFieldsFromSource;
+	var helper_36 = helper.normalizeDataField;
+	var helper_37 = helper.handleOnSuggestions;
+	var helper_38 = helper.isValidDateRangeQueryFormat;
 
 	var value = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -5781,7 +5991,7 @@
 	    };
 	  }
 
-	  function resetValuesToDefault() {
+	  function resetValuesToDefault(clearAllBlacklistComponents) {
 	    return function (dispatch, getState) {
 	      var _getState2 = getState(),
 	          selectedValues = _getState2.selectedValues,
@@ -5790,23 +6000,23 @@
 	      var defaultValues = {};
 	      var valueToSet = void 0;
 	      Object.keys(selectedValues).forEach(function (component) {
-	        if (!componentProps[component] || !componentProps[component].componentType || !componentProps[component].defaultValue) {
-	          valueToSet = null;
-	        } else if ([constants$1.componentTypes.rangeSlider, constants$1.componentTypes.rangeInput, constants$1.componentTypes.ratingsFilter, constants$1.componentTypes.dateRange].includes(componentProps[component].componentType)) {
-	          valueToSet = typeof componentProps[component].defaultValue === 'object' ? [componentProps[component].defaultValue.start, componentProps[component].defaultValue.end] : null;
-	        } else if ([constants$1.componentTypes.multiDropdownList, constants$1.componentTypes.multiDataList, constants$1.componentTypes.multiList, constants$1.componentTypes.singleDataList, constants$1.componentTypes.singleDropdownList, constants$1.componentTypes.singleList, constants$1.componentTypes.tagCloud, constants$1.componentTypes.toggleButton, constants$1.componentTypes.multiDropdownRange, constants$1.componentTypes.multiRange, constants$1.componentTypes.singleDropdownRange, constants$1.componentTypes.singleRange, constants$1.componentTypes.dataSearch, constants$1.componentTypes.datePicker].includes(componentProps[component].componentType)) {
-	          valueToSet = componentProps[component].defaultValue;
-	        } else if ([constants$1.componentTypes.categorySearch].includes(componentProps[component].componentType)) {
-	          valueToSet = componentProps[component].defaultValue ? componentProps[component].defaultValue.term : '';
-	        }
+	        if (!(Array.isArray(clearAllBlacklistComponents) && clearAllBlacklistComponents.includes(component))) {
+	          if (!componentProps[component] || !componentProps[component].componentType || !componentProps[component].defaultValue) {
+	            valueToSet = null;
+	          } else if ([constants$1.componentTypes.rangeSlider, constants$1.componentTypes.rangeInput, constants$1.componentTypes.ratingsFilter, constants$1.componentTypes.dateRange].includes(componentProps[component].componentType)) {
+	            valueToSet = typeof componentProps[component].defaultValue === 'object' ? [componentProps[component].defaultValue.start, componentProps[component].defaultValue.end] : null;
+	          } else if ([constants$1.componentTypes.multiDropdownList, constants$1.componentTypes.multiDataList, constants$1.componentTypes.multiList, constants$1.componentTypes.singleDataList, constants$1.componentTypes.singleDropdownList, constants$1.componentTypes.singleList, constants$1.componentTypes.tagCloud, constants$1.componentTypes.toggleButton, constants$1.componentTypes.multiDropdownRange, constants$1.componentTypes.multiRange, constants$1.componentTypes.singleDropdownRange, constants$1.componentTypes.singleRange, constants$1.componentTypes.dataSearch, constants$1.componentTypes.datePicker].includes(componentProps[component].componentType)) {
+	            valueToSet = componentProps[component].defaultValue;
+	          } else if ([constants$1.componentTypes.categorySearch].includes(componentProps[component].componentType)) {
+	            valueToSet = componentProps[component].defaultValue ? componentProps[component].defaultValue.term : '';
+	          }
 
-	        if (!(0, helper.isEqual)(selectedValues[component].value, valueToSet)) {
-	          defaultValues = _extends({}, defaultValues, _defineProperty({}, component, _extends({}, selectedValues[component], {
-	            value: valueToSet
-	          })));
+	          if (!(0, helper.isEqual)(selectedValues[component].value, valueToSet)) {
+	            defaultValues = _extends({}, defaultValues, _defineProperty({}, component, _extends({}, selectedValues[component], {
+	              value: valueToSet
+	            })));
+	          }
 	        }
-
-	        return true;
 	      });
 	      dispatch({
 	        type: constants.RESET_TO_DEFAULT,
@@ -5836,9 +6046,11 @@
 
 	  function clearValues() {
 	    var resetValues = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+	    var clearAllBlacklistComponents = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
 	    return {
 	      type: constants.CLEAR_VALUES,
-	      resetValues: resetValues
+	      resetValues: resetValues,
+	      clearAllBlacklistComponents: clearAllBlacklistComponents
 	    };
 	  }
 	});
@@ -5873,6 +6085,9 @@
 	  exports.setCustomData = setCustomData;
 	  exports.setAppliedSettings = setAppliedSettings;
 	  exports.setQueryListener = setQueryListener;
+	  exports.setGoogleMapScriptLoading = setGoogleMapScriptLoading;
+	  exports.setGoogleMapScriptLoaded = setGoogleMapScriptLoaded;
+	  exports.setGoogleMapScriptError = setGoogleMapScriptError;
 
 	  function setRawData(component, response) {
 	    return {
@@ -6043,6 +6258,27 @@
 	      onError: onError
 	    };
 	  }
+
+	  function setGoogleMapScriptLoading(bool) {
+	    return {
+	      type: constants.SET_GOOGLE_MAP_SCRIPT_LOADING,
+	      loading: bool
+	    };
+	  }
+
+	  function setGoogleMapScriptLoaded(bool) {
+	    return {
+	      type: constants.SET_GOOGLE_MAP_SCRIPT_LOADED,
+	      loaded: bool
+	    };
+	  }
+
+	  function setGoogleMapScriptError(error) {
+	    return {
+	      type: constants.SET_GOOGLE_MAP_SCRIPT_ERROR,
+	      error: error
+	    };
+	  }
 	});
 	unwrapExports(misc);
 	var misc_1 = misc.setRawData;
@@ -6065,6 +6301,9 @@
 	var misc_18 = misc.setCustomData;
 	var misc_19 = misc.setAppliedSettings;
 	var misc_20 = misc.setQueryListener;
+	var misc_21 = misc.setGoogleMapScriptLoading;
+	var misc_22 = misc.setGoogleMapScriptLoaded;
+	var misc_23 = misc.setGoogleMapScriptError;
 
 	var hits = createCommonjsModule(function (module, exports) {
 	  Object.defineProperty(exports, "__esModule", {
@@ -7205,7 +7444,7 @@
 	      }
 
 	      if (componentProps.componentType === constants$1.componentTypes.dynamicRangeSlider || componentProps.componentType === constants$1.componentTypes.rangeSlider) {
-	        calendarInterval = Object.keys(_dateFormats2["default"]).includes(queryFormat) ? componentProps.calendarInterval || 'month' : undefined;
+	        calendarInterval = Object.keys(_dateFormats2["default"]).includes(queryFormat) ? componentProps.calendarInterval : undefined;
 
 	        if (value) {
 	          if ((0, helper.isValidDateRangeQueryFormat)(componentProps.queryFormat)) {
@@ -8370,7 +8609,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;
@@ -8794,7 +9033,7 @@
 
 	          var oldQuery = queryLog[component];
 
-	          if (mustExecuteMapQuery || !(0, helper.isEqual)(currentQuery, oldQuery)) {
+	          if (mustExecuteMapQuery || !(0, helper.compareQueries)(currentQuery, oldQuery, false)) {
 	            orderOfQueries = [].concat(_toConsumableArray(orderOfQueries), [component]);
 	            dispatch((0, misc.logQuery)(component, queryToLog));
 	            var isMapComponent = Object.keys(mapData).includes(component);
@@ -8814,7 +9053,7 @@
 	              var _getState5 = getState(),
 	                  combinedLog = _getState5.combinedLog;
 
-	              if ((0, helper.isEqual)(combinedLog[component], currentQuery)) return;
+	              if ((0, helper.compareQueries)(combinedLog[component], currentQuery)) return;
 	              dispatch((0, misc.logCombinedQuery)(component, currentQuery));
 	            }
 
@@ -9031,7 +9270,7 @@
 	        query: _extends({}, queryObj)
 	      }, options);
 
-	      if ((0, helper.isEqual)(queryLog[component], currentQuery)) return;
+	      if ((0, helper.compareQueries)(queryLog[component], currentQuery)) return;
 	      dispatch((0, misc.logQuery)(component, currentQuery));
 
 	      if (store.config && store.config.enableAppbase) {
@@ -12781,7 +13020,7 @@
 	  return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteralLoose(["\n\tbackground-color: ", ";\n\tcolor: #ccc;\n\tcursor: not-allowed;\n\n\t&:hover,\n\t&:focus {\n\t\tbackground-color: ", ";\n\t}\n"])), theme.colors.backgroundColor ? curriedLighten(0.1, theme.colors.backgroundColor) : '#fafafa', theme.colors.backgroundColor ? curriedLighten(0.2, theme.colors.backgroundColor) : '#fafafa');
 	};
 
-	var Button = index$1('a')(_templateObject8 || (_templateObject8 = _taggedTemplateLiteralLoose(["\n\tdisplay: inline-flex;\n\tjustify-content: center;\n\talign-items: center;\n\tborder-radius: 3px;\n\tborder: 1px solid transparent;\n\tmin-height: 30px;\n\tword-wrap: break-word;\n\tpadding: 5px 12px;\n\tline-height: 1.2rem;\n\tbackground-color: ", ";\n\tcolor: ", ";\n\tcursor: pointer;\n\tuser-select: none;\n\ttransition: all 0.3s ease;\n\n\t&:hover,\n\t&:focus {\n\t\tbackground-color: ", ";\n\t}\n\n\t&:focus {\n\t\toutline: 0;\n\t\tborder-color: ", ";\n\t\tbox-shadow: ", ";\n\t}\n\n\t", ";\n\t", ";\n\t", ";\n"])), function (_ref4) {
+	var Button = index$1('a')(_templateObject8 || (_templateObject8 = _taggedTemplateLiteralLoose(["\n\tdisplay: inline-flex;\n\tjustify-content: center;\n\talign-items: center;\n\tborder-radius: 3px;\n\tborder: 1px solid transparent;\n\tmin-height: 30px;\n\tword-wrap: break-word;\n\tpadding: 5px 12px;\n\tline-height: 1.2rem;\n\tbackground-color: ", ";\n\tcolor: ", ";\n\tcursor: pointer;\n\tuser-select: none;\n\ttransition: all 0.3s ease;\n\n\t&:hover,\n\t&:focus {\n\t\tbackground-color: ", ";\n\t}\n\n\t&:focus {\n\t\toutline: 0;\n\t\tborder-color: ", ";\n\t\tbox-shadow: ", ";\n\t}\n\n\t", ";\n\t", ";\n\t", ";\n\n\t&.enter-btn {\n\t\tborder-top-left-radius: 0px;\n\t\tborder-bottom-left-radius: 0px;\n\t\theight: 100%;\n\t}\n"])), function (_ref4) {
 	  var theme = _ref4.theme;
 	  return theme.colors.backgroundColor || '#eee';
 	}, function (_ref5) {
@@ -14023,9 +14262,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: {
@@ -14184,7 +14424,7 @@
 	        filteredResults = [].concat(parsedPromotedResults, filteredResults);
 	      }
 
-	      return helper_3(filteredResults);
+	      return helper_8(filteredResults);
 	    }
 	  },
 	  watch: {
@@ -14223,19 +14463,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
 
 
@@ -14326,24 +14558,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
 
 
@@ -14351,20 +14583,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);
 
@@ -14479,18 +14704,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);
@@ -14593,16 +14818,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, {
@@ -14767,7 +14992,7 @@
 	  options.size = size || 10;
 
 	  var getSortOption = function getSortOption() {
-	    var _ref9;
+	    var _ref7;
 
 	    if (defaultSortOption) {
 	      var sortOption = sortOptionsNew.find(function (option) {
@@ -14775,35 +15000,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) {
@@ -14946,591 +15175,76 @@
 	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);
+	var _typeof$1 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+	  return typeof obj;
+	} : function (obj) {
+	  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+	};
 
-	  (function (self) {
-	    (function (self) {
-	      if (self.fetch) {
-	        return;
-	      }
+	function contains(string, substring) {
+	  return string.indexOf(substring) !== -1;
+	}
 
-	      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
-	      };
+	function isAppbase(url) {
+	  return contains(url, 'scalr.api.appbase.io');
+	}
 
-	      if (support.arrayBuffer) {
-	        var viewClasses = ['[object Int8Array]', '[object Uint8Array]', '[object Uint8ClampedArray]', '[object Int16Array]', '[object Uint16Array]', '[object Int32Array]', '[object Uint32Array]', '[object Float32Array]', '[object Float64Array]'];
+	function btoa$1() {
+	  var input = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+	  var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+	  var str = input;
+	  var output = ''; // eslint-disable-next-line
 
-	        var isDataView = function isDataView(obj) {
-	          return obj && DataView.prototype.isPrototypeOf(obj);
-	        };
+	  for (var block = 0, charCode, i = 0, map = chars; str.charAt(i | 0) || (map = '=', i % 1); // eslint-disable-line no-bitwise
+	  output += map.charAt(63 & block >> 8 - i % 1 * 8) // eslint-disable-line no-bitwise
+	  ) {
+	    charCode = str.charCodeAt(i += 3 / 4);
 
-	        var isArrayBufferView = ArrayBuffer.isView || function (obj) {
-	          return obj && viewClasses.indexOf(Object.prototype.toString.call(obj)) > -1;
-	        };
-	      }
+	    if (charCode > 0xff) {
+	      throw new Error('"btoa" failed: The string to be encoded contains characters outside of the Latin1 range.');
+	    }
 
-	      function normalizeName(name) {
-	        if (typeof name !== 'string') {
-	          name = String(name);
-	        }
+	    block = block << 8 | charCode; // eslint-disable-line no-bitwise
+	  }
 
-	        if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
-	          throw new TypeError('Invalid character in header field name');
-	        }
+	  return output;
+	}
 
-	        return name.toLowerCase();
-	      }
+	function validateRSQuery(query) {
+	  if (query && Object.prototype.toString.call(query) === '[object Array]') {
+	    for (var i = 0; i < query.length; i += 1) {
+	      var q = query[i];
 
-	      function normalizeValue(value) {
-	        if (typeof value !== 'string') {
-	          value = String(value);
+	      if (q) {
+	        if (!q.id) {
+	          return new Error("'id' field must be present in query object");
 	        }
+	      } else {
+	        return new Error('query object can not have an empty value');
+	      }
+	    }
 
-	        return value;
-	      } // Build a destructive iterator for the value list
+	    return true;
+	  }
 
+	  return new Error("invalid query value, 'query' value must be an array");
+	}
 
-	      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);
-
-	      Response.prototype.clone = function () {
-	        return new Response(this._bodyInit, {
-	          status: this.status,
-	          statusText: this.statusText,
-	          headers: new Headers(this.headers),
-	          url: this.url
-	        });
-	      };
-
-	      Response.error = function () {
-	        var response = new Response(null, {
-	          status: 0,
-	          statusText: ''
-	        });
-	        response.type = 'error';
-	        return response;
-	      };
-
-	      var redirectStatuses = [301, 302, 303, 307, 308];
-
-	      Response.redirect = function (url, status) {
-	        if (redirectStatuses.indexOf(status) === -1) {
-	          throw new RangeError('Invalid status code');
-	        }
-
-	        return new Response(null, {
-	          status: status,
-	          headers: {
-	            location: url
-	          }
-	        });
-	      };
-
-	      self.Headers = Headers;
-	      self.Request = Request;
-	      self.Response = Response;
-
-	      self.fetch = function (input, init) {
-	        return new Promise(function (resolve, reject) {
-	          var request = new Request(input, init);
-	          var xhr = new XMLHttpRequest();
-
-	          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));
-	          };
-
-	          xhr.onerror = function () {
-	            reject(new TypeError('Network request failed'));
-	          };
-
-	          xhr.ontimeout = function () {
-	            reject(new TypeError('Network request failed'));
-	          };
-
-	          xhr.open(request.method, request.url, true);
-
-	          if (request.credentials === 'include') {
-	            xhr.withCredentials = true;
-	          } else if (request.credentials === 'omit') {
-	            xhr.withCredentials = false;
-	          }
-
-	          if ('responseType' in xhr && support.blob) {
-	            xhr.responseType = 'blob';
-	          }
-
-	          request.headers.forEach(function (value, name) {
-	            xhr.setRequestHeader(name, value);
-	          });
-	          xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit);
-	        });
-	      };
-
-	      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 ( module.exports) {
-	    module.exports = fetch; // Needed for TypeScript consumers without esModuleInterop.
-
-	    module.exports["default"] = fetch;
-	  }
-	});
-
-	var _typeof$1 = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
-	  return typeof obj;
-	} : function (obj) {
-	  return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-	};
-
-	function contains(string, substring) {
-	  return string.indexOf(substring) !== -1;
-	}
-
-	function isAppbase(url) {
-	  return contains(url, 'scalr.api.appbase.io');
-	}
-
-	function btoa$1() {
-	  var input = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-	  var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-	  var str = input;
-	  var output = ''; // eslint-disable-next-line
-
-	  for (var block = 0, charCode, i = 0, map = chars; str.charAt(i | 0) || (map = '=', i % 1); // eslint-disable-line no-bitwise
-	  output += map.charAt(63 & block >> 8 - i % 1 * 8) // eslint-disable-line no-bitwise
-	  ) {
-	    charCode = str.charCodeAt(i += 3 / 4);
-
-	    if (charCode > 0xff) {
-	      throw new Error('"btoa" failed: The string to be encoded contains characters outside of the Latin1 range.');
-	    }
-
-	    block = block << 8 | charCode; // eslint-disable-line no-bitwise
-	  }
-
-	  return output;
-	}
-
-	function validateRSQuery(query) {
-	  if (query && Object.prototype.toString.call(query) === '[object Array]') {
-	    for (var i = 0; i < query.length; i += 1) {
-	      var q = query[i];
-
-	      if (q) {
-	        if (!q.id) {
-	          return new Error("'id' field must be present in query object");
-	        }
-	      } else {
-	        return new Error('query object can not have an empty value');
-	      }
-	    }
-
-	    return true;
-	  }
-
-	  return new Error("invalid query value, 'query' value must be an array");
-	}
-
-	function validate(object, fields) {
-	  var invalid = [];
-	  var emptyFor = {
-	    object: null,
-	    string: '',
-	    number: 0
-	  };
-	  var keys = Object.keys(fields);
-	  keys.forEach(function (key) {
-	    var types = fields[key].split('|');
-	    var matchedType = types.find(function (type) {
-	      return (// eslint-disable-next-line
-	        _typeof$1(object[key]) === type
-	      );
-	    });
+	function validate(object, fields) {
+	  var invalid = [];
+	  var emptyFor = {
+	    object: null,
+	    string: '',
+	    number: 0
+	  };
+	  var keys = Object.keys(fields);
+	  keys.forEach(function (key) {
+	    var types = fields[key].split('|');
+	    var matchedType = types.find(function (type) {
+	      return (// eslint-disable-next-line
+	        _typeof$1(object[key]) === type
+	      );
+	    });
 
 	    if (!matchedType || object[key] === emptyFor[matchedType]) {
 	      invalid.push(key);
@@ -15791,17 +15505,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;
@@ -15809,6 +15516,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;
@@ -15906,7 +15619,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()
@@ -17161,14 +16874,14 @@
 	      this.updateState(this.$props);
 	    },
 	    analyticsConfig: function analyticsConfig(newVal, oldVal) {
-	      if (!helper_18(newVal, oldVal)) {
+	      if (!helper_25(newVal, oldVal)) {
 	        if (this.store) {
 	          this.store.dispatch(analytics_3$1(newVal));
 	        }
 	      }
 	    },
 	    appbaseConfig: function appbaseConfig(newVal, oldVal) {
-	      if (!helper_18(newVal, oldVal)) {
+	      if (!helper_25(newVal, oldVal)) {
 	        if (this.store) {
 	          this.store.dispatch(analytics_3$1(newVal));
 	        }
@@ -19850,7 +19563,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,
@@ -19906,11 +19620,15 @@
 	      console.warn('Warning(ReactiveSearch): In order to use the `index` prop, the `enableAppbase` prop must be set to true in `ReactiveBase`.');
 	    }
 
-	    this.loadPopularSuggestions(this.$props.componentId);
 	    this.currentValue = this.selectedValue || '';
+	    var shouldFetchInitialSuggestions = this.$props.enableDefaultSuggestions || this.currentValue;
+
+	    if (shouldFetchInitialSuggestions) {
+	      this.loadPopularSuggestions(this.$props.componentId);
 
-	    if (enableRecentSearches) {
-	      this.getRecentSearches();
+	      if (enableRecentSearches) {
+	        this.getRecentSearches();
+	      }
 	    }
 
 	    this.handleTextChange = debounce$1(this.handleText, this.$props.debounce); // Set custom and default queries in store
@@ -19947,7 +19665,7 @@
 	    defaultSearchSuggestions: function defaultSearchSuggestions() {
 	      var isPopularSuggestionsEnabled = this.enableQuerySuggestions || this.enablePopularSuggestions;
 
-	      if (this.currentValue) {
+	      if (this.currentValue || !this.enableDefaultSuggestions) {
 	        return [];
 	      }
 
@@ -20044,7 +19762,8 @@
 	    addonBefore: VueTypes.any,
 	    addonAfter: VueTypes.any,
 	    expandSuggestionsContainer: VueTypes.bool.def(true),
-	    index: VueTypes.string
+	    index: VueTypes.string,
+	    enableDefaultSuggestions: VueTypes.bool.def(true)
 	  },
 	  beforeMount: function beforeMount() {
 	    if (this.$props.highlight) {
@@ -20212,7 +19931,7 @@
 	    // returns size and aggs property
 	    getBasicQueryOptions: function getBasicQueryOptions() {
 	      var aggregationField = this.$props.aggregationField;
-	      var queryOptions = helper_20(this.$props);
+	      var queryOptions = helper_28(this.$props);
 
 	      if (aggregationField) {
 	        queryOptions.aggs = getCompositeAggsQuery$1({
@@ -20308,12 +20027,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);
 	      }
@@ -20337,13 +20057,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);
 	      }
@@ -20670,11 +20390,17 @@
 	    var _this$$props4 = this.$props,
 	        theme = _this$$props4.theme,
 	        size = _this$$props4.size,
-	        expandSuggestionsContainer = _this$$props4.expandSuggestionsContainer;
+	        expandSuggestionsContainer = _this$$props4.expandSuggestionsContainer,
+	        enableDefaultSuggestions = _this$$props4.enableDefaultSuggestions;
 	    var _this$$scopedSlots = this.$scopedSlots,
 	        recentSearchesIcon = _this$$scopedSlots.recentSearchesIcon,
 	        popularSearchesIcon = _this$$scopedSlots.popularSearchesIcon;
 	    var hasSuggestions = this.currentValue ? this.suggestionsList.length || this.topSuggestions.length : this.defaultSearchSuggestions.length;
+
+	    if (enableDefaultSuggestions === false && !this.currentValue) {
+	      hasSuggestions = false;
+	    }
+
 	    return h(Container, {
 	      "class": this.$props.className
 	    }, [this.$props.title && h(Title, {
@@ -21032,6 +20758,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,
@@ -21069,7 +20799,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) {
@@ -21243,7 +20973,9 @@
 	    applyStopwords: VueTypes.bool,
 	    customStopwords: types.stringArray,
 	    onData: types.func,
-	    renderItem: types.func
+	    renderItem: types.func,
+	    enterButton: VueTypes.bool.def(false),
+	    renderEnterButton: VueTypes.any
 	  },
 	  mounted: function mounted() {
 	    this.listenForFocusShortcuts();
@@ -21356,7 +21088,7 @@
 	        this.triggerDefaultQuery(value);
 	      } else if (this.$props.autosuggest) {
 	        this.triggerDefaultQuery(value);
-	      } else {
+	      } else if (!this.$props.enterButton) {
 	        this.triggerCustomQuery(value);
 	      }
 	    },
@@ -21403,7 +21135,7 @@
 	    // returns size and aggs property
 	    getBasicQueryOptions: function getBasicQueryOptions() {
 	      var aggregationField = this.$props.aggregationField;
-	      var queryOptions = helper_20(this.$props);
+	      var queryOptions = helper_28(this.$props);
 
 	      if (aggregationField) {
 	        queryOptions.aggs = getCompositeAggsQuery$2({
@@ -21772,15 +21504,56 @@
 
 	      return null;
 	    },
-	    renderIcons: function renderIcons() {
+	    renderEnterButtonElement: function renderEnterButtonElement() {
+	      var _this4 = this;
+
 	      var h = this.$createElement;
 	      var _this$$props4 = this.$props,
-	          iconPosition = _this$$props4.iconPosition,
-	          showClear = _this$$props4.showClear,
-	          innerClass = _this$$props4.innerClass,
-	          getMicInstance = _this$$props4.getMicInstance,
-	          showVoiceSearch = _this$$props4.showVoiceSearch,
-	          showIcon = _this$$props4.showIcon;
+	          enterButton = _this$$props4.enterButton,
+	          innerClass = _this$$props4.innerClass;
+	      var renderEnterButton = this.$scopedSlots.renderEnterButton;
+
+	      var enterButtonOnClick = function enterButtonOnClick() {
+	        return _this4.triggerQuery({
+	          isOpen: false,
+	          value: _this4.currentValue,
+	          customQuery: true
+	        });
+	      };
+
+	      if (enterButton) {
+	        var getEnterButtonMarkup = function getEnterButtonMarkup() {
+	          if (renderEnterButton) {
+	            return renderEnterButton(enterButtonOnClick);
+	          }
+
+	          return h(Button, {
+	            "class": "enter-btn " + getClassName$4(innerClass, 'enterButton'),
+	            "attrs": {
+	              "primary": true
+	            },
+	            "on": {
+	              "click": enterButtonOnClick
+	            }
+	          }, ["Search"]);
+	        };
+
+	        return h("div", {
+	          "class": "enter-button-wrapper"
+	        }, [getEnterButtonMarkup()]);
+	      }
+
+	      return null;
+	    },
+	    renderIcons: function renderIcons() {
+	      var h = this.$createElement;
+	      var _this$$props5 = this.$props,
+	          iconPosition = _this$$props5.iconPosition,
+	          showClear = _this$$props5.showClear,
+	          innerClass = _this$$props5.innerClass,
+	          getMicInstance = _this$$props5.getMicInstance,
+	          showVoiceSearch = _this$$props5.showVoiceSearch,
+	          showIcon = _this$$props5.showIcon;
 	      var renderMic = this.$scopedSlots.renderMic || this.$props.renderMic;
 	      var currentValue = this.$data.currentValue;
 	      return h("div", [h(IconGroup, {
@@ -21832,7 +21605,7 @@
 	      (_this$$refs = this.$refs) == null ? void 0 : (_this$$refs$this$$pro = _this$$refs[this.$props.innerRef]) == null ? void 0 : _this$$refs$this$$pro.focus(); // eslint-disable-line
 	    },
 	    listenForFocusShortcuts: function listenForFocusShortcuts() {
-	      var _this4 = this;
+	      var _this5 = this;
 
 	      var _this$$props$focusSho = this.$props.focusShortcuts,
 	          focusShortcuts = _this$$props$focusSho === void 0 ? ['/'] : _this$$props$focusSho;
@@ -21850,7 +21623,7 @@
 	        // Prevent the default refresh event under WINDOWS system
 	        event.preventDefault();
 
-	        _this4.focusSearchBox(event);
+	        _this5.focusSearchBox(event);
 	      }); // if one of modifier keys are used, they are handled below
 
 	      hotkeys('*', function (event) {
@@ -21861,7 +21634,7 @@
 	          var element = modifierKeys[index];
 
 	          if (hotkeys[element]) {
-	            _this4.focusSearchBox(event);
+	            _this5.focusSearchBox(event);
 
 	            break;
 	          }
@@ -21875,14 +21648,14 @@
 	      this.triggerDefaultQuery(value);
 	    },
 	    renderAutoFill: function renderAutoFill(suggestion) {
-	      var _this5 = this;
+	      var _this6 = this;
 
 	      var h = this.$createElement;
 
 	      var handleAutoFillClick = function handleAutoFillClick(e) {
 	        e.stopPropagation();
 
-	        _this5.onAutofillClick(suggestion);
+	        _this6.onAutofillClick(suggestion);
 	      };
 	      /* 👇 avoid showing autofill for category suggestions👇 */
 
@@ -21895,12 +21668,12 @@
 	    }
 	  },
 	  render: function render() {
-	    var _this6 = this;
+	    var _this7 = this;
 
 	    var h = arguments[0];
-	    var _this$$props5 = this.$props,
-	        theme = _this$$props5.theme,
-	        expandSuggestionsContainer = _this$$props5.expandSuggestionsContainer;
+	    var _this$$props6 = this.$props,
+	        theme = _this$$props6.theme,
+	        expandSuggestionsContainer = _this$$props6.expandSuggestionsContainer;
 	    var _this$$scopedSlots = this.$scopedSlots,
 	        recentSearchesIcon = _this$$scopedSlots.recentSearchesIcon,
 	        popularSearchesIcon = _this$$scopedSlots.popularSearchesIcon;
@@ -21930,10 +21703,10 @@
 	          var renderSuggestionsDropdown = function renderSuggestionsDropdown() {
 	            var getIcon = function getIcon(iconType) {
 	              switch (iconType) {
-	                case helper_1.Recent:
+	                case helper_6.Recent:
 	                  return recentSearchesIcon;
 
-	                case helper_1.Popular:
+	                case helper_6.Popular:
 	                  return popularSearchesIcon;
 
 	                default:
@@ -21941,14 +21714,14 @@
 	              }
 	            };
 
-	            return h("div", [_this6.hasCustomRenderer && _this6.getComponent({
+	            return h("div", [_this7.hasCustomRenderer && _this7.getComponent({
 	              isOpen: isOpen,
 	              getItemProps: getItemProps,
 	              getItemEvents: getItemEvents,
 	              highlightedIndex: highlightedIndex
-	            }), _this6.renderErrorComponent(), !_this6.hasCustomRenderer && isOpen && hasSuggestions ? h("ul", {
-	              "class": suggestions$1(_this6.themePreset, theme) + " " + getClassName$4(_this6.$props.innerClass, 'list')
-	            }, [_this6.normalizedSuggestions.map(function (item, index) {
+	            }), _this7.renderErrorComponent(), !_this7.hasCustomRenderer && isOpen && hasSuggestions ? h("ul", {
+	              "class": suggestions$1(_this7.themePreset, theme) + " " + getClassName$4(_this7.$props.innerClass, 'list')
+	            }, [_this7.normalizedSuggestions.map(function (item, index) {
 	              return renderItem ? h("li", {
 	                "domProps": _extends({}, getItemProps({
 	                  item: item
@@ -21958,7 +21731,7 @@
 	                })),
 	                "key": index + 1 + "-" + item.value,
 	                "style": {
-	                  backgroundColor: _this6.getBackgroundColor(highlightedIndex, index),
+	                  backgroundColor: _this7.getBackgroundColor(highlightedIndex, index),
 	                  justifyContent: 'flex-start',
 	                  alignItems: 'center'
 	                }
@@ -21971,7 +21744,7 @@
 	                })),
 	                "key": index + 1 + "-" + item.value,
 	                "style": {
-	                  backgroundColor: _this6.getBackgroundColor(highlightedIndex, index),
+	                  backgroundColor: _this7.getBackgroundColor(highlightedIndex, index),
 	                  justifyContent: 'flex-start',
 	                  alignItems: 'center'
 	                }
@@ -21982,61 +21755,61 @@
 	                }
 	              }, [h(CustomSvg, {
 	                "attrs": {
-	                  "className": getClassName$4(_this6.$props.innerClass, item._suggestion_type + "-search-icon") || null,
+	                  "className": getClassName$4(_this7.$props.innerClass, item._suggestion_type + "-search-icon") || null,
 	                  "icon": getIcon(item._suggestion_type),
 	                  "type": item._suggestion_type + "-search-icon"
 	                }
 	              })]), h(SuggestionItem, {
 	                "attrs": {
-	                  "currentValue": _this6.currentValue,
+	                  "currentValue": _this7.currentValue,
 	                  "suggestion": item
 	                }
-	              }), _this6.renderAutoFill(item)]);
-	            })]) : _this6.renderNoSuggestions(_this6.normalizedSuggestions)]);
+	              }), _this7.renderAutoFill(item)]);
+	            })]) : _this7.renderNoSuggestions(_this7.normalizedSuggestions)]);
 	          };
 
 	          return h("div", {
 	            "class": suggestionsContainer
-	          }, [h(InputGroup, [_this6.renderInputAddonBefore(), h(InputWrapper, [h(Input, {
+	          }, [h(InputGroup, [_this7.renderInputAddonBefore(), h(InputWrapper, [h(Input, {
 	            "attrs": {
-	              "id": _this6.$props.componentId + "-input",
-	              "showIcon": _this6.$props.showIcon,
-	              "showClear": _this6.$props.showClear,
-	              "iconPosition": _this6.$props.iconPosition,
-	              "placeholder": _this6.$props.placeholder,
-	              "autoFocus": _this6.$props.autoFocus,
-	              "themePreset": _this6.themePreset,
+	              "id": _this7.$props.componentId + "-input",
+	              "showIcon": _this7.$props.showIcon,
+	              "showClear": _this7.$props.showClear,
+	              "iconPosition": _this7.$props.iconPosition,
+	              "placeholder": _this7.$props.placeholder,
+	              "autoFocus": _this7.$props.autoFocus,
+	              "themePreset": _this7.themePreset,
 	              "autocomplete": "off"
 	            },
-	            "ref": _this6.$props.innerRef,
-	            "class": getClassName$4(_this6.$props.innerClass, 'input'),
+	            "ref": _this7.$props.innerRef,
+	            "class": getClassName$4(_this7.$props.innerClass, 'input'),
 	            "on": _extends({}, getInputEvents({
-	              onInput: _this6.onInputChange,
+	              onInput: _this7.onInputChange,
 	              onBlur: function onBlur(e) {
-	                _this6.$emit('blur', e, _this6.triggerQuery);
+	                _this7.$emit('blur', e, _this7.triggerQuery);
 	              },
-	              onFocus: _this6.handleFocus,
+	              onFocus: _this7.handleFocus,
 	              onKeyPress: function onKeyPress(e) {
-	                _this6.$emit('keyPress', e, _this6.triggerQuery);
+	                _this7.$emit('keyPress', e, _this7.triggerQuery);
 
-	                _this6.$emit('key-press', e, _this6.triggerQuery);
+	                _this7.$emit('key-press', e, _this7.triggerQuery);
 	              },
 	              onKeyDown: function onKeyDown(e) {
-	                return _this6.handleKeyDown(e, highlightedIndex);
+	                return _this7.handleKeyDown(e, highlightedIndex);
 	              },
 	              onKeyUp: function onKeyUp(e) {
-	                _this6.$emit('keyUp', e, _this6.triggerQuery);
+	                _this7.$emit('keyUp', e, _this7.triggerQuery);
 
-	                _this6.$emit('key-up', e, _this6.triggerQuery);
+	                _this7.$emit('key-up', e, _this7.triggerQuery);
 	              },
 	              onClick: function onClick() {
 	                setHighlightedIndex(null);
 	              }
 	            })),
 	            "domProps": _extends({}, getInputProps({
-	              value: _this6.$data.currentValue === null ? '' : _this6.$data.currentValue
+	              value: _this7.$data.currentValue === null ? '' : _this7.$data.currentValue
 	            }))
-	          }), _this6.renderIcons(), !expandSuggestionsContainer && renderSuggestionsDropdown()]), _this6.renderInputAddonAfter()]), expandSuggestionsContainer && renderSuggestionsDropdown()]);
+	          }), _this7.renderIcons(), !expandSuggestionsContainer && renderSuggestionsDropdown()]), _this7.renderInputAddonAfter(), _this7.renderEnterButtonElement()]), expandSuggestionsContainer && renderSuggestionsDropdown()]);
 	        }
 	      }
 	    }) : h("div", {
@@ -22052,26 +21825,26 @@
 	      },
 	      "on": _extends({}, {
 	        blur: function blur(e) {
-	          _this6.$emit('blur', e, _this6.triggerQuery);
+	          _this7.$emit('blur', e, _this7.triggerQuery);
 	        },
 	        keypress: function keypress(e) {
-	          _this6.$emit('keyPress', e, _this6.triggerQuery);
+	          _this7.$emit('keyPress', e, _this7.triggerQuery);
 
-	          _this6.$emit('key-press', e, _this6.triggerQuery);
+	          _this7.$emit('key-press', e, _this7.triggerQuery);
 	        },
 	        input: this.onInputChange,
 	        focus: function focus(e) {
-	          _this6.$emit('focus', e, _this6.triggerQuery);
+	          _this7.$emit('focus', e, _this7.triggerQuery);
 	        },
 	        keydown: function keydown(e) {
-	          _this6.$emit('keyDown', e, _this6.triggerQuery);
+	          _this7.$emit('keyDown', e, _this7.triggerQuery);
 
-	          _this6.$emit('key-down', e, _this6.triggerQuery);
+	          _this7.$emit('key-down', e, _this7.triggerQuery);
 	        },
 	        keyup: function keyup(e) {
-	          _this6.$emit('keyUp', e, _this6.triggerQuery);
+	          _this7.$emit('keyUp', e, _this7.triggerQuery);
 
-	          _this6.$emit('key-up', e, _this6.triggerQuery);
+	          _this7.$emit('key-up', e, _this7.triggerQuery);
 	        }
 	      }),
 	      "domProps": _extends({}, {
@@ -22079,7 +21852,7 @@
 	        value: this.$data.currentValue ? this.$data.currentValue : ''
 	      }),
 	      "ref": this.$props.innerRef
-	    }), this.renderIcons()]), this.renderInputAddonAfter()])])]);
+	    }), this.renderIcons()]), this.renderInputAddonAfter(), this.renderEnterButtonElement()])])]);
 	  },
 	  destroyed: function destroyed() {
 	    document.removeEventListener('keydown', this.onKeyDown);
@@ -22328,8 +22101,9 @@
 	var getQueryOptions$1 = lib_8.getQueryOptions,
 	    checkValueChange$2 = lib_8.checkValueChange,
 	    getClassName$5 = lib_8.getClassName,
-	    getOptionsFromQuery$2 = lib_8.getOptionsFromQuery,
-	    isEqual$6 = lib_8.isEqual;
+	    isEqual$6 = lib_8.isEqual,
+	    extractQueryFromCustomQuery$2 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$2 = lib_8.getOptionsForCustomQuery;
 	var SingleList = {
 	  name: 'SingleList',
 	  props: {
@@ -22566,22 +22340,22 @@
 	      checkValueChange$2(props.componentId, value, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = SingleList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$2(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
-	        }
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsFromQuery$2(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$2(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -22592,17 +22366,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleList.defaultQuery(value, props);
-	      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);
+	        var customQueryOptions = getOptionsForCustomQuery$2(customQueryCalc);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -22622,7 +22394,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);
@@ -22767,6 +22539,10 @@
 	  return query;
 	};
 
+	SingleList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$5 = function mapStateToProps(state, props) {
 	  return {
 	    options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -22788,7 +22564,7 @@
 	};
 	var ListConnected = ComponentWrapper$1(connect(mapStateToProps$5, mapDispatchtoProps$2)(SingleList), {
 	  componentType: constants_1$1.singleList,
-	  internalComponent: true
+	  internalComponent: SingleList.hasInternalComponent()
 	});
 
 	SingleList.install = function (Vue) {
@@ -22806,7 +22582,8 @@
 	    getQueryOptions$2 = lib_8.getQueryOptions,
 	    checkValueChange$3 = lib_8.checkValueChange,
 	    getClassName$6 = lib_8.getClassName,
-	    getOptionsFromQuery$3 = lib_8.getOptionsFromQuery;
+	    extractQueryFromCustomQuery$3 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$3 = lib_8.getOptionsForCustomQuery;
 	var MultiList = {
 	  name: 'MultiList',
 	  props: {
@@ -22833,7 +22610,7 @@
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
 	    showSearch: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -23120,22 +22897,22 @@
 	      checkValueChange$3(props.componentId, finalValues, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = MultiList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$3(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
-	        }
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsFromQuery$3(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$3(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -23146,17 +22923,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiList.defaultQuery(value, props);
-	      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);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$3(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -23176,7 +22951,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);
@@ -23262,7 +23037,13 @@
 
 	MultiList.defaultQuery = function (value, props) {
 	  var query = null;
-	  var type = props.queryFormat === 'or' ? 'terms' : 'term';
+	  var queryFormat = props.queryFormat;
+
+	  if (queryFormat === undefined) {
+	    queryFormat = 'or';
+	  }
+
+	  var type = queryFormat === 'or' ? 'terms' : 'term';
 
 	  if (!Array.isArray(value) || value.length === 0) {
 	    return null;
@@ -23283,14 +23064,14 @@
 	  } else if (value) {
 	    var listQuery;
 
-	    if (props.queryFormat === 'or') {
+	    if (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({
@@ -23317,9 +23098,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: {
@@ -23369,9 +23150,14 @@
 	  setCustomQuery: setCustomQuery$3,
 	  setDefaultQuery: setDefaultQuery$4
 	};
+
+	MultiList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var ListConnected$1 = ComponentWrapper$1(connect(mapStateToProps$6, mapDispatchtoProps$3)(MultiList), {
 	  componentType: constants_1$1.multiList,
-	  internalComponent: true
+	  internalComponent: MultiList.hasInternalComponent()
 	});
 
 	MultiList.install = function (Vue) {
@@ -23698,9 +23484,10 @@
 	    checkValueChange$4 = lib_8.checkValueChange,
 	    checkPropChange$1 = lib_8.checkPropChange,
 	    getClassName$8 = lib_8.getClassName,
-	    getOptionsFromQuery$4 = lib_8.getOptionsFromQuery,
 	    isEqual$8 = lib_8.isEqual,
-	    getCompositeAggsQuery$3 = lib_8.getCompositeAggsQuery;
+	    getCompositeAggsQuery$3 = lib_8.getCompositeAggsQuery,
+	    extractQueryFromCustomQuery$4 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$4 = lib_8.getOptionsForCustomQuery;
 	var SingleDropdownList = {
 	  name: 'SingleDropdownList',
 	  data: function data() {
@@ -23737,7 +23524,7 @@
 	    selectAllLabel: types.string,
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -23949,22 +23736,22 @@
 	      }
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = SingleDropdownList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$4(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
-	        }
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsFromQuery$4(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$4(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -23975,17 +23762,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleDropdownList.defaultQuery(value, props);
-	      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);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$4(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -24019,7 +23804,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);
@@ -24111,6 +23896,10 @@
 	  }) : getAggsQuery(queryOptions, props);
 	};
 
+	SingleDropdownList.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],
@@ -24132,7 +23921,7 @@
 	};
 	var ListConnected$2 = ComponentWrapper$1(connect(mapStateToProps$7, mapDispatchtoProps$4)(SingleDropdownList), {
 	  componentType: constants_1$1.singleDropdownList,
-	  internalComponent: true
+	  internalComponent: SingleDropdownList.hasInternalComponent()
 	});
 
 	SingleDropdownList.install = function (Vue) {
@@ -24151,8 +23940,9 @@
 	    checkValueChange$5 = lib_8.checkValueChange,
 	    checkPropChange$2 = lib_8.checkPropChange,
 	    getClassName$9 = lib_8.getClassName,
-	    getOptionsFromQuery$5 = lib_8.getOptionsFromQuery,
-	    getCompositeAggsQuery$4 = lib_8.getCompositeAggsQuery;
+	    getCompositeAggsQuery$4 = lib_8.getCompositeAggsQuery,
+	    extractQueryFromCustomQuery$5 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$5 = lib_8.getOptionsForCustomQuery;
 	var MultiDropdownList = {
 	  name: 'MultiDropdownList',
 	  data: function data() {
@@ -24190,7 +23980,7 @@
 	    selectAllLabel: types.string,
 	    showCount: VueTypes.bool.def(true),
 	    showFilter: VueTypes.bool.def(true),
-	    size: VueTypes.number.def(100),
+	    size: VueTypes.number,
 	    sortBy: VueTypes.oneOf(['asc', 'desc', 'count']).def('count'),
 	    title: types.title,
 	    URLParams: VueTypes.bool.def(false),
@@ -24476,22 +24266,22 @@
 	      checkValueChange$5(props.componentId, finalValues, props.beforeValueChange, performUpdate);
 	    },
 	    updateDefaultQueryHandler: function updateDefaultQueryHandler(value, props) {
-	      var defaultQueryOptions;
 	      var query = MultiDropdownList.defaultQuery(value, props);
 
 	      if (this.defaultQuery) {
 	        var defaultQueryToBeSet = this.defaultQuery(value, props) || {};
+	        var defaultQueryObj = extractQueryFromCustomQuery$5(defaultQueryToBeSet);
 
-	        if (defaultQueryToBeSet.query) {
-	          query = defaultQueryToBeSet.query;
-	        }
+	        if (defaultQueryObj) {
+	          query = defaultQueryObj;
+	        } // Update calculated default query in store
 
-	        defaultQueryOptions = getOptionsFromQuery$5(defaultQueryToBeSet); // Update calculated default query in store
 
 	        updateDefaultQuery(props.componentId, this.setDefaultQuery, props, value);
+	        var defaultQueryOptions = getOptionsForCustomQuery$5(defaultQueryToBeSet);
+	        this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(this.internalComponent, defaultQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.internalComponent,
 	        query: query,
@@ -24502,17 +24292,15 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiDropdownList.defaultQuery(value, props);
-	      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);
 	        updateCustomQuery(props.componentId, this.setCustomQuery, props, value);
+	        var customQueryOptions = getOptionsForCustomQuery$5(customQueryCalc);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -24546,7 +24334,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);
@@ -24582,7 +24370,13 @@
 
 	MultiDropdownList.defaultQuery = function (value, props) {
 	  var query = null;
-	  var type = props.queryFormat === 'or' ? 'terms' : 'term';
+	  var queryFormat = props.queryFormat;
+
+	  if (queryFormat === undefined) {
+	    queryFormat = 'or';
+	  }
+
+	  var type = queryFormat === 'or' ? 'terms' : 'term';
 
 	  if (!Array.isArray(value) || value.length === 0) {
 	    return null;
@@ -24603,14 +24397,14 @@
 	  } else if (value) {
 	    var listQuery;
 
-	    if (props.queryFormat === 'or') {
+	    if (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({
@@ -24637,9 +24431,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: {
@@ -24674,6 +24468,10 @@
 	  }) : getAggsQuery(queryOptions, props);
 	};
 
+	MultiDropdownList.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$8 = function mapStateToProps(state, props) {
 	  return {
 	    options: props.nestedField && state.aggregations[props.componentId] ? state.aggregations[props.componentId].reactivesearch_nested : state.aggregations[props.componentId],
@@ -24695,7 +24493,7 @@
 	};
 	var ListConnected$3 = ComponentWrapper$1(connect(mapStateToProps$8, mapDispatchtoProps$5)(MultiDropdownList), {
 	  componentType: constants_1$1.multiDropdownList,
-	  internalComponent: true
+	  internalComponent: MultiDropdownList.hasInternalComponent()
 	});
 
 	MultiDropdownList.install = function (Vue) {
@@ -24711,7 +24509,7 @@
 	var isEqual$a = lib_8.isEqual,
 	    checkValueChange$6 = lib_8.checkValueChange,
 	    getClassName$a = lib_8.getClassName,
-	    getOptionsFromQuery$6 = lib_8.getOptionsFromQuery,
+	    getOptionsFromQuery = lib_8.getOptionsFromQuery,
 	    handleA11yAction$1 = lib_8.handleA11yAction;
 	var ToggleButton = {
 	  name: 'ToggleButton',
@@ -24877,7 +24675,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);
 	      }
 
@@ -25035,10 +24833,7 @@
 
 	ToggleButton.componentType = constants_1$1.toggleButton;
 
-	var _excluded = ["options"],
-	    _excluded2 = ["query"],
-	    _excluded3 = ["query"],
-	    _excluded4 = ["query"];
+	var _excluded = ["options"];
 	var updateQuery$8 = lib_5.updateQuery,
 	    setQueryOptions$7 = lib_5.setQueryOptions,
 	    setCustomQuery$7 = lib_5.setCustomQuery,
@@ -25046,15 +24841,16 @@
 	var parseHits$1 = lib_8.parseHits,
 	    isEqual$b = lib_8.isEqual,
 	    getCompositeAggsQuery$5 = lib_8.getCompositeAggsQuery,
-	    getOptionsFromQuery$7 = lib_8.getOptionsFromQuery,
-	    getResultStats$3 = lib_8.getResultStats;
+	    getResultStats$3 = lib_8.getResultStats,
+	    extractQueryFromCustomQuery$6 = lib_8.extractQueryFromCustomQuery,
+	    getOptionsForCustomQuery$6 = lib_8.getOptionsForCustomQuery;
 	var ReactiveComponent = {
 	  name: 'ReactiveComponent',
 	  props: {
 	    componentId: types.stringRequired,
 	    aggregationField: types.string,
 	    aggregationSize: VueTypes.number,
-	    size: VueTypes.number.def(20),
+	    size: VueTypes.number,
 	    defaultQuery: types.func,
 	    customQuery: types.func,
 	    filterLabel: types.string,
@@ -25096,25 +24892,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,
@@ -25122,36 +24909,35 @@
 	      });
 	    }
 
-	    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);
+	      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
+
+	      if (queryToBeSet && queryToBeSet.query) {
+	        queryToBeSet = queryToBeSet.query;
 	      }
 
-	      var queryToBeSet = obj.query; // when enableAppbase is true, Backend throws error because of repeated query in request body
+	      var customQueryCalc = _extends({}, options, {
+	        query: queryToBeSet
+	      });
 
-	      if (obj && obj.query && obj.query.query) {
-	        queryToBeSet = obj.query.query;
-	      } // Update customQuery field for RS API
+	      var rsAPIQuery = customQueryCalc; // handle stored queries
 
+	      if (queryToBeSet && queryToBeSet.id) {
+	        rsAPIQuery = queryToBeSet;
+	      } // Update customQuery field for RS API
 
-	      if (obj && obj.query || options) {
-	        var customQueryCalc = _extends({}, options);
 
-	        if (obj && obj.query) {
-	          if (obj.query.id) {
-	            customQueryCalc = queryToBeSet;
-	          } else {
-	            customQueryCalc.query = obj.query;
-	          }
-	        }
+	      _this.setCustomQuery(props.componentId, rsAPIQuery);
 
-	        _this.setCustomQuery(props.componentId, customQueryCalc);
+	      if (options) {
+	        _this.setQueryOptions(props.componentId, _extends({}, _this.getAggsQuery(), options), false);
 	      }
 
 	      _this.updateQuery(_extends({}, obj, {
+	        query: customQueryCalc.query,
 	        componentId: props.componentId,
 	        label: props.filterLabel,
 	        showFilter: props.showFilter,
@@ -25162,29 +24948,22 @@
 	    if (props.defaultQuery) {
 	      this.internalComponent = props.componentId + "__internal";
 	    }
-	  },
-	  beforeMount: function beforeMount() {
+
 	    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
 	      });
 	    }
 	  },
@@ -25232,10 +25011,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);
@@ -25243,15 +25020,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
 	        });
 	      }
 	    },
@@ -25259,10 +25030,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);
@@ -25270,15 +25039,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
 	        });
 	      }
 	    }
@@ -25358,6 +25121,10 @@
 	  }
 	};
 
+	ReactiveComponent.hasInternalComponent = function (props) {
+	  return !!props.defaultQuery;
+	};
+
 	var mapStateToProps$a = function mapStateToProps(state, props) {
 	  return {
 	    aggregations: state.aggregations[props.componentId] && state.aggregations[props.componentId] || null,
@@ -25407,6 +25174,7 @@
 	    showClearAll: VueTypes.bool.def(true),
 	    title: types.title,
 	    resetToDefault: VueTypes.bool.def(false),
+	    clearAllBlacklistComponents: VueTypes.array,
 	    resetToValues: VueTypes.object
 	  },
 	  inject: {
@@ -25461,12 +25229,13 @@
 	    },
 	    clearValues: function clearValues() {
 	      var resetToDefault = this.resetToDefault,
-	          resetToValues = this.resetToValues;
+	          resetToValues = this.resetToValues,
+	          clearAllBlacklistComponents = this.clearAllBlacklistComponents;
 
 	      if (resetToDefault) {
-	        this.resetValuesToDefault();
+	        this.resetValuesToDefault(clearAllBlacklistComponents);
 	      } else {
-	        this.clearValuesAction(resetToValues);
+	        this.clearValuesAction(resetToValues, clearAllBlacklistComponents);
 	      }
 
 	      this.$emit('clear', resetToValues);
@@ -25564,7 +25333,7 @@
 	var isEqual$c = lib_8.isEqual,
 	    checkValueChange$7 = lib_8.checkValueChange,
 	    getClassName$c = lib_8.getClassName,
-	    getOptionsFromQuery$8 = lib_8.getOptionsFromQuery;
+	    getOptionsFromQuery$1 = lib_8.getOptionsFromQuery;
 	var SingleRange = {
 	  name: 'SingleRange',
 	  data: function data() {
@@ -25694,17 +25463,16 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = SingleRange.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$8(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$1(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -25792,7 +25560,7 @@
 	var isEqual$d = lib_8.isEqual,
 	    checkValueChange$8 = lib_8.checkValueChange,
 	    getClassName$d = lib_8.getClassName,
-	    getOptionsFromQuery$9 = lib_8.getOptionsFromQuery;
+	    getOptionsFromQuery$2 = lib_8.getOptionsFromQuery;
 	var MultiRange = {
 	  name: 'MultiRange',
 	  data: function data() {
@@ -25903,17 +25671,16 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = MultiRange.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$9(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$2(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -26404,7 +26171,7 @@
 	    setCustomQuery$a = lib_5.setCustomQuery;
 	var checkValueChange$9 = lib_8.checkValueChange,
 	    getClassName$e = lib_8.getClassName,
-	    getOptionsFromQuery$a = lib_8.getOptionsFromQuery,
+	    getOptionsFromQuery$3 = lib_8.getOptionsFromQuery,
 	    isEqual$e = lib_8.isEqual;
 	var RangeSlider = {
 	  name: 'RangeSlider',
@@ -26494,14 +26261,14 @@
 	    updateQueryHandler: function updateQueryHandler(value, props) {
 	      var customQuery = props.customQuery;
 	      var query = RangeSlider.defaultQuery(value, props);
-	      var customQueryOptions;
 
 	      if (customQuery) {
 	        var _ref = customQuery(value, props) || {};
 
 	        query = _ref.query;
-	        customQueryOptions = getOptionsFromQuery$a(customQuery(value, props));
+	        var customQueryOptions = getOptionsFromQuery$3(customQuery(value, props));
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, this.currentValue);
+	        this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      }
 
 	      var showFilter = props.showFilter,
@@ -26512,7 +26279,6 @@
 	          currentEnd = value[1]; // check if the slider is at its initial position
 
 	      var isInitialValue = currentStart === start && currentEnd === end;
-	      this.setQueryOptions(props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: props.componentId,
 	        query: query,
@@ -26686,9 +26452,10 @@
 	    updateComponentProps$2 = lib_5.updateComponentProps;
 	var checkValueChange$a = lib_8.checkValueChange,
 	    getClassName$f = lib_8.getClassName,
-	    getOptionsFromQuery$b = lib_8.getOptionsFromQuery,
 	    isEqual$f = 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(),
@@ -26896,28 +26663,31 @@
 	    },
 	    updateQueryHandler: function updateQueryHandler(value) {
 	      var query = DynamicRangeSlider.defaultQuery(value, this.$props);
-	      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));
+	        var customQueryOptions = getOptionsForCustomQuery$7(customQueryTobeSet);
 	        updateCustomQuery(this.componentId, this.setCustomQuery, this.$props, value);
+	        this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
 	      }
 
-	      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
 
 	      var isInitialValue = currentStart === start && currentEnd === end;
-	      this.setQueryOptions(this.$props.componentId, customQueryOptions, false);
 	      this.updateQuery({
 	        componentId: this.$props.componentId,
 	        query: query,
@@ -26964,13 +26734,13 @@
 	    range: function range(newValue, oldValue) {
 	      if (isEqual$f(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;
@@ -27065,6 +26835,10 @@
 	  return [];
 	};
 
+	DynamicRangeSlider.hasInternalComponent = function () {
+	  return true;
+	};
+
 	var mapStateToProps$f = function mapStateToProps(state, props) {
 	  var componentId = state.aggregations[props.componentId];
 	  var internalRange = state.aggregations[props.componentId + "__range__internal"];
@@ -27290,10 +27064,10 @@
 	  Vue.component(StateProvider.name, StateProviderConnected);
 	};
 
-	var _excluded$5 = ["aggs", "size"];
+	var _excluded$5 = ["aggs", "size"],
+	    _excluded2 = ["query"],
+	    _excluded3 = ["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];
 
@@ -27327,23 +27101,40 @@
 	  }
 
 	  return value;
-	}
+	} // Returns query DSL with query property and other options
+
 
-	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
+	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_14(defaultQuery)
+	    }, helper_15(defaultQuery));
+	  }
+
+	  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 _extends({
+	      query: helper_14(customQuery)
+	    }, helper_15(customQuery));
 	  }
 
-	  return component.source.defaultQuery ? component.source.defaultQuery(currentValue, component) : {};
+	  return component.source.defaultQuery ? {
+	    query: component.source.defaultQuery(currentValue, component)
+	  } : null;
 	}
 
 	function initReactivesearch(componentCollection, searchState, settings) {
@@ -27398,6 +27189,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;
@@ -27429,74 +27225,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
 
@@ -27505,7 +27293,7 @@
 	        var react = component.react;
 
 	        if (isInternalComponentPresent || isResultComponent) {
-	          react = helper_22(react, internalComponent);
+	          react = helper_30(react, internalComponent);
 	        }
 
 	        dependencyTree = dependencyTreeReducer(dependencyTree, {
@@ -27514,25 +27302,42 @@
 	          react: react
 	        });
 	      } // [4] set query list
+	      // Do not set default query for suggestions
 
 
-	      if (isResultComponent) {
-	        var _getQuery = getQuery(component, value, componentType),
-	            query = _getQuery.query;
+	      if (isInternalComponentPresent && !transform_7(component.componentType)) {
+	        var _ref2 = getDefaultQuery(component, value) || {},
+	            defaultQuery = _ref2.query,
+	            defaultQueryOptions = _objectWithoutPropertiesLoose(_ref2, _excluded2);
 
 	        queryList = queryReducer(queryList, {
 	          type: 'SET_QUERY',
 	          component: internalComponent,
-	          query: query
+	          query: defaultQuery
 	        });
-	      } else {
-	        queryList = queryReducer(queryList, {
-	          type: 'SET_QUERY',
-	          component: component.componentId,
-	          query: getQuery(component, value, componentType)
+	        queryOptions = queryOptionsReducer(queryOptions, {
+	          type: 'SET_QUERY_OPTIONS',
+	          component: internalComponent,
+	          options: _extends({}, componentQueryOptions, defaultQueryOptions)
 	        });
-	      } // Set component type in component props
+	      }
+
+	      var _ref3 = getCustomQuery(component, value) || {},
+	          query = _ref3.query,
+	          options = _objectWithoutPropertiesLoose(_ref3, _excluded3);
 
+	      var customQuery = query; // 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({}, options)
+	      }); // Set component type in component props
 
 	      compProps.componentType = componentType;
 	      componentProps[component.componentId] = compProps;
@@ -27551,13 +27356,14 @@
 
 	    componentCollection.forEach(function (component) {
 	      // eslint-disable-next-line
-	      var _buildQuery = helper_21(component.componentId, dependencyTree, queryList, queryOptions),
+	      var _buildQuery = helper_29(component.componentId, dependencyTree, queryList, queryOptions),
 	          queryObj = _buildQuery.queryObj,
 	          options = _buildQuery.options;
 
-	      var validOptions = ['aggs', 'from', 'sort']; // check if query or options are valid - non-empty
+	      var componentQueryOptions = options;
+	      var validOptions = ['aggs', 'from', 'sort']; // check if query or componentQueryOptions are valid - non-empty
 
-	      if (queryObj && !!Object.keys(queryObj).length || options && Object.keys(options).some(function (item) {
+	      if (queryObj && !!Object.keys(queryObj).length || componentQueryOptions && Object.keys(componentQueryOptions).some(function (item) {
 	        return validOptions.includes(item);
 	      })) {
 	        var _extends2;
@@ -27572,7 +27378,7 @@
 
 	        var currentQuery = _extends({
 	          query: _extends({}, queryObj)
-	        }, options, queryOptions[component.componentId]);
+	        }, componentQueryOptions, queryOptions[component.componentId]);
 
 	        queryLog = _extends({}, queryLog, (_extends2 = {}, _extends2[component.componentId] = currentQuery, _extends2));
 
@@ -27760,7 +27566,7 @@
 	  });
 	}
 
-	var version = "1.27.0-gamma.3";
+	var version = "1.29.0";
 
 	var _templateObject$o, _templateObject2$a;