diff --git a/frontend/src/components/FeatureCustom.vue b/frontend/src/components/FeatureCustom.vue
index 7ab9c07..4581edd 100644
--- a/frontend/src/components/FeatureCustom.vue
+++ b/frontend/src/components/FeatureCustom.vue
@@ -21,7 +21,7 @@
           <v-combobox
             class="code"
             label="OSM key"
-            v-model="f.parameter"
+            :search-input.sync="f.parameter"
             :items="$store.state.osmKeys"
             @input="getValues"
           >
@@ -65,7 +65,7 @@
           <v-combobox
             class="code"
             label="OSM value"
-            v-model="f.value"
+            :search-input.sync="f.value"
             :items="$store.state.selectedKeyValues"
             :disabled="
               f.comparison == 'is null' || f.comparison == 'is not null'
@@ -125,7 +125,7 @@ export default {
           value: "",
         },
       ];
-      this.selectedQueryType = "point";
+      this.selectedQueryType = "any";
     },
     addFilter() {
       this.filters.push({
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index aa37aa9..13f5c7d 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -117,6 +117,9 @@ export default new Vuex.Store({
     },
     getValues({ commit }, v) {
       commit("setSelectedKeyValues", []);
+      if (v == "" || v == undefined || v == null) {
+        return;
+      }
 
       fetch(
         "https://taginfo.openstreetmap.org/api/4/key/values?rp=50&sortname=count_all&sortorder=desc&key=" +