diff --git a/frontend/src/modules/member/components/member-autocomplete-input.vue b/frontend/src/modules/member/components/member-autocomplete-input.vue
deleted file mode 100644
index 0923c50094..0000000000
--- a/frontend/src/modules/member/components/member-autocomplete-input.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <div style="display: flex">
-    <app-autocomplete-one-input
-      v-if="mode !== 'multiple'"
-      v-model="model"
-      :fetch-fn="fetchFn"
-      :placeholder="placeholder"
-      :input-class="inputClass"
-      :in-memory-filter="false"
-    ></app-autocomplete-one-input>
-    <app-autocomplete-many-input
-      v-if="mode === 'multiple'"
-      v-model="model"
-      :fetch-fn="fetchFn"
-      :placeholder="placeholder"
-      :input-class="inputClass"
-      :in-memory-filter="false"
-    ></app-autocomplete-many-input>
-    <el-button
-      v-if="hasPermissionToCreate && showCreate"
-      style="margin-left: 16px"
-      class="btn btn--secondary btn--secondary--orange"
-      @click="doOpenModal()"
-    ></el-button>
-  </div>
-</template>
-
-<script>
-import { MemberPermissions } from '@/modules/member/member-permissions'
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'AppMemberAutocompleteInput',
-  props: {
-    modelValue: {
-      type: Object,
-      default: () => {}
-    },
-    mode: {
-      type: String,
-      default: 'single'
-    },
-    fetchFn: {
-      type: Function,
-      default: () => {}
-    },
-    mapperFn: {
-      type: Function,
-      default: () => {}
-    },
-    showCreate: {
-      type: Boolean,
-      default: false
-    },
-    placeholder: {
-      type: String,
-      default: null
-    },
-    inputClass: {
-      type: String,
-      default: null
-    }
-  },
-
-  emits: ['update:modelValue'],
-
-  data() {
-    return {
-      dialogVisible: false
-    }
-  },
-
-  computed: {
-    ...mapGetters({
-      currentUser: 'auth/currentUser',
-      currentTenant: 'auth/currentTenant'
-    }),
-
-    model: {
-      get: function () {
-        return this.modelValue
-      },
-
-      set: function (value) {
-        this.$emit('update:modelValue', value)
-      }
-    },
-
-    hasPermissionToCreate() {
-      return new MemberPermissions(
-        this.currentTenant,
-        this.currentUser
-      ).create
-    }
-  },
-
-  methods: {
-    doOpenModal() {
-      this.dialogVisible = true
-    },
-
-    onModalSuccess(record) {
-      if (this.mode === 'multiple') {
-        this.model = [...this.model, this.mapperFn(record)]
-      } else {
-        this.model = this.mapperFn(record)
-      }
-
-      this.onModalClose()
-    },
-
-    onModalClose() {
-      this.dialogVisible = false
-    }
-  }
-}
-</script>
-
-<style>
-.el-form-item .el-form-item {
-  margin-bottom: 22px;
-}
-</style>
diff --git a/frontend/src/modules/member/components/member-dropdown.vue b/frontend/src/modules/member/components/member-dropdown.vue
index 50216bb348..50f5acec6b 100644
--- a/frontend/src/modules/member/components/member-dropdown.vue
+++ b/frontend/src/modules/member/components/member-dropdown.vue
@@ -324,6 +324,7 @@ export default {
           { username: {}, attributes: {} }
         ]
         this.isMergeDialogOpen = true
+        this.memberToMerge = null
       } else if (command.action === 'memberEnrich') {
         this.doEnrich(command.member.id)
       } else {
diff --git a/frontend/src/modules/member/components/member-selection-dropdown.vue b/frontend/src/modules/member/components/member-selection-dropdown.vue
index c237b9067a..c42b8e7e11 100644
--- a/frontend/src/modules/member/components/member-selection-dropdown.vue
+++ b/frontend/src/modules/member/components/member-selection-dropdown.vue
@@ -6,13 +6,14 @@
     <div class="text-gray-900 text-sm">
       Select the member you want to merge with
     </div>
-    <app-member-autocomplete-input
-      v-model="computedMemberToMerge"
-      :fetch-fn="fetchFn"
-      placeholder="Type to search member"
-      input-class="w-full"
-      mode="single"
-    />
+    <div class="flex w-3/5">
+      <app-autocomplete-one-input
+        v-model="computedMemberToMerge"
+        :fetch-fn="fetchFn"
+        placeholder="Type to search members"
+        input-class="w-full"
+      ></app-autocomplete-one-input>
+    </div>
   </div>
 </template>
 
@@ -56,9 +57,18 @@ const fetchFn = async (query, limit) => {
     query,
     limit
   )
-  return options.filter((m) => {
+
+  // Remove primary member from members that can be merged with
+  const filteredOptions = options.filter((m) => {
     return m.id !== props.id
   })
+
+  // If the primary member was removed, add an empty object in replacement
+  if (options.length !== filteredOptions.length) {
+    filteredOptions.push({})
+  }
+
+  return filteredOptions
 }
 </script>
 
diff --git a/frontend/src/modules/member/member-module.js b/frontend/src/modules/member/member-module.js
index c5a4f3a1d5..fe0611c347 100644
--- a/frontend/src/modules/member/member-module.js
+++ b/frontend/src/modules/member/member-module.js
@@ -1,11 +1,7 @@
 import routes from '@/modules/member/member-routes'
 import store from '@/modules/member/store'
-import MemberAutocompleteInput from '@/modules/member/components/member-autocomplete-input.vue'
 
 export default {
-  components: {
-    'app-member-autocomplete-input': MemberAutocompleteInput
-  },
   routes,
   store
 }
diff --git a/frontend/src/modules/tag/components/tag-autocomplete-input.vue b/frontend/src/modules/tag/components/tag-autocomplete-input.vue
index cb3d55babe..70033db67a 100644
--- a/frontend/src/modules/tag/components/tag-autocomplete-input.vue
+++ b/frontend/src/modules/tag/components/tag-autocomplete-input.vue
@@ -1,24 +1,13 @@
 <template>
   <div class="app-tags-input" style="display: flex">
     <app-autocomplete-many-input
-      v-if="multiple"
       v-model="model"
       :fetch-fn="fetchFn"
       :create-fn="createTag"
       :mapper-fn="mapperFn"
       :placeholder="placeholder"
       :create-if-not-found="canCreate"
-      :in-memory-filter="false"
     ></app-autocomplete-many-input>
-    <app-autocomplete-one-input
-      v-else
-      v-model="model"
-      :fetch-fn="fetchFn"
-      :create-fn="createTag"
-      :mapper-fn="mapperFn"
-      :placeholder="placeholder"
-      :create-if-not-found="canCreate"
-    ></app-autocomplete-one-input>
   </div>
 </template>
 
@@ -48,10 +37,6 @@ export default {
     placeholder: {
       type: String,
       default: null
-    },
-    multiple: {
-      type: Boolean,
-      default: true
     }
   },
   emits: ['update:modelValue'],
diff --git a/frontend/src/shared/form/autocomplete-one-input.vue b/frontend/src/shared/form/autocomplete-one-input.vue
index 78a1b487c5..9eeb3990c6 100644
--- a/frontend/src/shared/form/autocomplete-one-input.vue
+++ b/frontend/src/shared/form/autocomplete-one-input.vue
@@ -12,6 +12,7 @@
     :remote="true"
     :reserve-keyword="false"
     :allow-create="allowCreate"
+    fit-input-width
     value-key="id"
     :class="inputClass"
     @change="onChange"
@@ -25,14 +26,33 @@
       <span class="prefix">{{ createPrefix }}</span>
       <span>{{ currentQuery }}</span>
     </el-option>
-    <el-option
+    <Fragment
       v-for="record in localOptions"
       :key="record.id"
-      :label="record.label"
-      :value="record"
-      @mouseleave="onSelectMouseLeave"
     >
-    </el-option>
+      <el-option
+        v-if="record.id"
+        :value="record"
+        class="!px-5"
+        @mouseleave="onSelectMouseLeave"
+      >
+        <span class="text-ellipsis overflow-hidden">
+          {{ record.label }}
+        </span>
+      </el-option>
+    </Fragment>
+    <div
+      v-if="!loading && localOptions.length === limit"
+      class="px-5 text-gray-400 text-2xs w-full h-8 flex items-center"
+    >
+      Type to search for more results
+    </div>
+    <div
+      v-else-if="showEmptyMessage"
+      class="px-5 text-gray-400 text-xs w-full h-10 flex items-center justify-center"
+    >
+      No matches found
+    </div>
   </el-select>
 </template>
 
@@ -40,7 +60,7 @@
 import isString from 'lodash/isString'
 import { onSelectMouseLeave } from '@/utils/select'
 
-const AUTOCOMPLETE_SERVER_FETCH_SIZE = 100
+const AUTOCOMPLETE_SERVER_FETCH_SIZE = 20
 
 export default {
   name: 'AppAutocompleteOneInput',
@@ -58,10 +78,6 @@ export default {
       type: Function,
       default: () => {}
     },
-    mapperFn: {
-      type: Function,
-      default: () => {}
-    },
     createFn: {
       type: Function,
       default: () => {}
@@ -96,7 +112,8 @@ export default {
     return {
       loading: false,
       localOptions: this.options ? this.options : [],
-      currentQuery: ''
+      currentQuery: '',
+      limit: AUTOCOMPLETE_SERVER_FETCH_SIZE
     }
   },
 
@@ -111,6 +128,16 @@ export default {
             o === this.currentQuery
         )
       )
+    },
+    showEmptyMessage() {
+      // Show empty message if request is not loading,
+      // there are options or the only option is empty
+      return (
+        !this.loading &&
+        (!this.localOptions.length ||
+          (this.localOptions.length === 1 &&
+            !this.localOptions[0].id))
+      )
     }
   },
 
@@ -153,7 +180,10 @@ export default {
       this.loading = true
 
       try {
-        this.localOptions = await this.fetchFn()
+        this.localOptions = await this.fetchFn(
+          this.currentQuery,
+          AUTOCOMPLETE_SERVER_FETCH_SIZE
+        )
         this.loading = false
       } catch (error) {
         console.error(error)
@@ -187,5 +217,3 @@ export default {
   }
 }
 </script>
-
-<style></style>
diff --git a/frontend/src/shared/form/platform-autocomplete-input.vue b/frontend/src/shared/form/platform-autocomplete-input.vue
deleted file mode 100644
index ba1fc5f169..0000000000
--- a/frontend/src/shared/form/platform-autocomplete-input.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div>
-    <app-autocomplete-one-input
-      v-model="computedModel"
-      :options="platforms"
-      :placeholder="placeholder"
-    />
-  </div>
-</template>
-
-<script>
-import AppAutocompleteOneInput from './autocomplete-one-input'
-import integrationsJson from '@/jsons/integrations'
-
-export default {
-  name: 'AppPlatformAutocompleteInput',
-  components: {
-    AppAutocompleteOneInput
-  },
-  props: {
-    modelValue: {
-      type: String,
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: null
-    }
-  },
-  emits: ['update:modelValue'],
-  computed: {
-    platforms() {
-      return integrationsJson
-        .filter((i) => i.platform !== 'other')
-        .map((integration) => {
-          return {
-            id: integration.platform,
-            value: integration.platform,
-            label: integration.name
-          }
-        })
-    },
-    computedModel: {
-      set(value) {
-        if (typeof value === 'object' && value) {
-          this.$emit('update:modelValue', value.id)
-        } else {
-          this.$emit('update:modelValue', this.model)
-        }
-      },
-      get() {
-        return this.platforms.find(
-          (i) => i.id === this.modelValue
-        )
-      }
-    }
-  }
-}
-</script>