diff --git a/app/scripts/components/facets/facets.controllers.ts b/app/scripts/components/facets/facets.controllers.ts
index 5b1778c2e..f089ffce0 100644
--- a/app/scripts/components/facets/facets.controllers.ts
+++ b/app/scripts/components/facets/facets.controllers.ts
@@ -204,11 +204,8 @@ module ngApp.components.facets.controllers {
       }
     }
 
-    autoComplete() {
-      this.FacetService.autoComplete(this.$scope.entity, this.query, this.$scope.field)
-        .then((response) => {
-          this.results = response;
-        });
+    autoComplete(query: string): ng.IPromise<any> {
+      return this.FacetService.autoComplete(this.$scope.entity, query, this.$scope.field);
     }
 
     remove(term: string): void {
diff --git a/app/scripts/components/facets/templates/facets-free-text.html b/app/scripts/components/facets/templates/facets-free-text.html
index 5e3db545f..7569b66ca 100644
--- a/app/scripts/components/facets/templates/facets-free-text.html
+++ b/app/scripts/components/facets/templates/facets-free-text.html
@@ -18,15 +18,15 @@
     </span>
   </p>
 
-  <div class="input-group search-input" data-ng-if="!ftc.collapsed"
-       data-ng-class="{ 'has-error': !ftc.results.length && ftc.query }">
+  <div>
+  </div>
+  <div class="input-group search-input" data-ng-if="!ftc.collapsed">
     <span class="fa fa-search"></span>
-    <input type="text" data-ng-model="ftc.query"
+    <input type="text" data-ng-model="ftc.searchTerm"
            placeholder="{{ 'Search for' | translate }} {{ placeholder | translate }}"
-           data-typeahead="id for id in ftc.results | limitTo: 10"
+           data-typeahead="id for id in ftc.autoComplete($viewValue) | limitTo: 10"
            data-typeahead-on-select="ftc.termSelected()"
            data-typeahead-min-length="2"
-           data-ng-change="ftc.autoComplete()"
            maxlength="100"
            id="{{ 'autocomplete-' + title }}"
            typeahead-template-url="{{ template }}"