diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue
index 385d139bddaded0355dcfcd40f4e30a52ac9f6cd..f6d3a91651daea9720aa8e5f899d1d5cf27585bb 100644
--- a/src/components/Autocomplete.vue
+++ b/src/components/Autocomplete.vue
@@ -29,7 +29,7 @@
       <span class="search-hit">
         {{data.item.label}}
       </span>
-      ({{data.item.lang? data.item.lang[1] ? "bm, nn" : {"bob": "bm", "nob": "nn"}[data.item.lang[0]] : ["fulltekst","fritekst","avansert søk"][data.item.search]}})
+        ({{data.item.lang? data.item.lang[1] ? "bm, nn" : {"bob": "bm", "nob": "nn"}[data.item.lang[0]] : ["søker...","fritekst","avansert søk"][data.item.search]}})
       </template>
       <template slot="no-data">
         <div></div>
@@ -76,21 +76,18 @@
     methods: {
       run_query(q, time) {
         this.suggesting = true
-        // Keep full text search in the list while requesting suggestions
+        // Search options while waiting for response
+        var search = 0
         if (this.items[0]) {
           if (this.items[0].time < time) {
             if (/_|\*|\|/.test(q)) {
-              this.items.splice(0,1, {q: q, label: q, time: time, search: 2})
+              search = 2
             }
-            else { 
-              this.items.splice(0,1, {q: q+"*", label: q, time: time, search: 1})
-            }
-            
-            
+            this.items.splice(0,1, {q: q, label: q+" ", time: time, search: search})
           }
         }
         else {
-          this.items.splice(0,1, {q: q+"*", label: q, time: time, search: 1})
+          this.items.push({q: q, label: q+" ", time: time, search: search})
         }
         let self = this
         self.api.get('suggest?', {params: {q: q, dict: self.$parent.lang, n: 80, scope: 'w'}})