diff --git a/src/components/Search/OcResourceSearchSimple/OcResourceSearchSimple.vue b/src/components/Search/OcResourceSearchSimple/OcResourceSearchSimple.vue
index 5196836d52d6fa75a24dd51ed8bd84c2cd3e5f52..cc37d66df60313806bd72e308c4d7e7f66ae81e6 100644
--- a/src/components/Search/OcResourceSearchSimple/OcResourceSearchSimple.vue
+++ b/src/components/Search/OcResourceSearchSimple/OcResourceSearchSimple.vue
@@ -47,6 +47,7 @@
         :inputProps="{ fluid: true }"
         :initialValue="model.params[key as keyof typeof SearchQueryParams]"
         v-on:updateValue="handleChange($event, key)"
+        v-on:keyup.enter="emit('submit')"
       />
     </div>
     <div class="text-right">
@@ -65,11 +66,11 @@
     />
     <template v-for="key in Object.keys(SearchQueryParams)" v-bind:key="key">
       <Chip
-        v-for="value in model.params[key]" v-bind:key="value"
+        v-for="value in model.params[key as keyof typeof SearchQueryParams]" v-bind:key="value"
         class="bg-gray-200"
         :label="translateValue(searchMetadata[key as keyof typeof SearchQueryParams].label) + ': ' + value"
         removable
-        @remove="model.params[key]=[], emit('submit')"
+        @remove="model.params[key]=model.params[key as keyof typeof SearchQueryParams]?.filter((v) => v != value), emit('submit')"
       />
     </template>
   </div>