diff --git a/package-lock.json b/package-lock.json
index 726773e..9b4075a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "6.0.0-rc.14",
       "devDependencies": {
         "@bimdata/components": "^1.0.6",
-        "@bimdata/design-system": "2.0.0-rc.36",
+        "@bimdata/design-system": "2.1.0-rc.6",
         "@bimdata/vite-plugin-libcss": "0.0.1",
         "@semantic-release/changelog": "^6.0.3",
         "@semantic-release/commit-analyzer": "^9.0.2",
@@ -90,9 +90,9 @@
       }
     },
     "node_modules/@bimdata/design-system": {
-      "version": "2.0.0-rc.36",
-      "resolved": "https://registry.npmjs.org/@bimdata/design-system/-/design-system-2.0.0-rc.36.tgz",
-      "integrity": "sha512-UBDtmodwVCWNN+3Ep5ikM24FnNPe0zs/0dQw1qPj2g5vzqj7vwDISctiignqWtgsAc3l31XvnRUx2O6oWSMqzQ==",
+      "version": "2.1.0-rc.6",
+      "resolved": "https://registry.npmjs.org/@bimdata/design-system/-/design-system-2.1.0-rc.6.tgz",
+      "integrity": "sha512-6RCV2t5D8v0uzOkuJUKyaA/WArN9rAoDZ1IGfDA0Xtyrst/0c7BemCTT5SnK7TTy97+No9Ike4UpMAIZEkpWwA==",
       "dev": true
     },
     "node_modules/@bimdata/typescript-fetch-api-client": {
diff --git a/package.json b/package.json
index 63f5ecc..36653b5 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@bimdata/components": "^1.0.6",
-    "@bimdata/design-system": "2.0.0-rc.36",
+    "@bimdata/design-system": "2.1.0-rc.6",
     "@bimdata/vite-plugin-libcss": "0.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/commit-analyzer": "^9.0.2",
diff --git a/src/components/bcf-topic-form/BcfTopicForm.vue b/src/components/bcf-topic-form/BcfTopicForm.vue
index e3d8d90..209bf7c 100644
--- a/src/components/bcf-topic-form/BcfTopicForm.vue
+++ b/src/components/bcf-topic-form/BcfTopicForm.vue
@@ -127,11 +127,16 @@
         />
         <BIMDataSelect
           width="100%"
+          :search="true"
+          :clearSearchOnLeave="true"
           :label="$t('BcfComponents.BcfTopicForm.assignedToLabel')"
           :options="extensions.user_id_type"
           :disabled="extensions.user_id_type.length === 0"
           v-model="topicAssignedTo"
-        />
+          :searchPlaceholder="$t('BcfComponents.BcfTopicForm.searchPlaceholder')"
+        >
+          <template #empty> <span class="color-granite p-x-12">{{ $t('BcfComponents.BcfTopicForm.emptySearch') }}</span> </template>
+        </BIMDataSelect>
         <div class="m-b-30">
           <BIMDataDatePicker
             width="100%"
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index f2c7789..26d20b5 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -65,7 +65,9 @@
             "cancelButton": "Discard changes",
             "continueButton": "Continue editing",
             "createTitle": "Report a problem",
-            "dragDropImageTextTablet": "Take a picture"
+            "dragDropImageTextTablet": "Take a picture",
+            "searchPlaceholder": "Search",
+            "emptySearch": "No result"
         },
         "BcfTopicOverview": {
             "openViewer": "Open in viewer",
diff --git a/src/i18n/lang/fr.json b/src/i18n/lang/fr.json
index 087cfe0..4231a52 100644
--- a/src/i18n/lang/fr.json
+++ b/src/i18n/lang/fr.json
@@ -67,7 +67,9 @@
             "cancelButton": "Annuler les modifications",
             "continueButton": "Continuer les modifications",
             "takeSnapshot": "Prendre un snapshot",
-            "importFile": "Importer un fichier"
+            "importFile": "Importer un fichier",
+            "searchPlaceholder": "Rechercher",
+            "emptySearch": "Pas de résultat"
         },
         "BcfTopicOverview": {
             "openViewer": "Ouvrir dans le viewer",