diff --git a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
index 4537c45160..611ba05f3a 100644
--- a/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/badge-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options as |option|}}
- {{option.name}}
diff --git a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
index bc2181f534..76aad2442f 100644
--- a/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options as |option|}}
- {{category-link option allowUncategorized="true" link="false"}}
diff --git a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
index 3f4359aab5..7d1d72e88d 100644
--- a/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/category-tag-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options as |option|}}
-
diff --git a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
index c36583c6ed..230c236033 100644
--- a/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options as |option|}}
-
diff --git a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
index 4537c45160..e9e8d159fc 100644
--- a/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/group-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options as |option|}}
- {{option.name}}
diff --git a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
index a72dd3e518..1c0856d2cc 100644
--- a/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/user-selector-autocomplete.raw.hbs
@@ -1,4 +1,4 @@
-
+
{{#each options.users as |user|}}
-