diff --git a/app/frontend/controllers/search_controller.js b/app/frontend/controllers/search_controller.js
index 72532e24a..565b9d0d1 100644
--- a/app/frontend/controllers/search_controller.js
+++ b/app/frontend/controllers/search_controller.js
@@ -10,7 +10,7 @@ const populateOptions = (results, selectEl) => {
   Object.keys(results).forEach((key) => {
     const option = document.createElement('option')
     option.value = key
-    option.innerHTML = searchableName(results[key])
+    option.innerHTML = results[key].value
     if (results[key].hint) { option.setAttribute('data-hint', results[key].hint) }
     option.setAttribute('text', searchableName(results[key]))
     selectEl.appendChild(option)
diff --git a/app/frontend/modules/search.js b/app/frontend/modules/search.js
index c2679b80c..efdf7b9d0 100644
--- a/app/frontend/modules/search.js
+++ b/app/frontend/modules/search.js
@@ -119,7 +119,7 @@ export const suggestion = (value, options) => {
 
 export const searchSuggestion = (value, options) => {
   try {
-    const option = options.find((o) => o.innerHTML === value)
+    const option = options.find((o) => o.getAttribute('text') === value)
     if (option) {
       const result = enhanceOption(option)
       const html = result.append ? `<span class="autocomplete__option__append">${result.text}</span> <span>${result.append}</span>` : `<span>${result.text}</span>`
@@ -176,7 +176,7 @@ export const confirmSelectedOption = (selectEl, val) => {
 
   const selectedOption = [].filter.call(
     arrayOfOptions,
-    (option) => option.innerHTML === val
+    (option) => option.getAttribute('text') === val
   )[0]
   if (selectedOption) selectedOption.selected = true
 }