diff --git a/app/scripts/components/facets/facets.services.ts b/app/scripts/components/facets/facets.services.ts
index f920f1508..28f813669 100644
--- a/app/scripts/components/facets/facets.services.ts
+++ b/app/scripts/components/facets/facets.services.ts
@@ -41,7 +41,9 @@ module ngApp.components.facets.services {
       }
 
       return this.Restangular.all(entity + "/ids").get("", options).then((data) => {
-        return data.data.hits.length ? data.data.hits : [{'warning': 'No Results Found'}];
+        var model = {};
+        model[field.split(".").pop()] = query + "*";
+        return [model].concat(data.data.hits);
       });
     }
 
@@ -144,19 +146,21 @@ module ngApp.components.facets.services {
 
       // TODO - not like this
       var found = false;
-      var cs = filters["content"];
+      var cs = filters.content;
+
       for (var i = 0; i < cs.length; i++) {
-        var c = cs[i]["content"];
-        if (c["field"] === facet && cs[i]["op"] === op) {
+        var c = cs[i].content;
+        if (c.field === facet && cs[i].op === op) {
           found = true;
-          if (c["value"].indexOf(term) === -1) {
-            c["value"].push(term);
+          if (c.value.indexOf(term) === -1) {
+            c.value.push(term);
           } else {
             return;
           }
           break;
         }
       }
+
       if (!found) {
         cs.push({
           op: op,
@@ -166,6 +170,7 @@ module ngApp.components.facets.services {
           }
         });
       }
+
       this.LocationService.setFilters(filters);
     }
 
diff --git a/app/scripts/components/facets/templates/typeahead-cases.html b/app/scripts/components/facets/templates/typeahead-cases.html
index 2917cb6bc..5a32191a0 100644
--- a/app/scripts/components/facets/templates/typeahead-cases.html
+++ b/app/scripts/components/facets/templates/typeahead-cases.html
@@ -8,7 +8,7 @@
         <span class="uuid">{{ match.model.case_id }}</span>
       </div>
       <div class="data-row sub-item">
-        {{ match.model.submitter_id }}
+        {{ match.model.submitter_id || 'Prefix search' }}
       </div>
     </div>
   </div>
diff --git a/app/scripts/components/facets/templates/typeahead-files.html b/app/scripts/components/facets/templates/typeahead-files.html
index df1adea17..40788e7f9 100644
--- a/app/scripts/components/facets/templates/typeahead-files.html
+++ b/app/scripts/components/facets/templates/typeahead-files.html
@@ -8,7 +8,7 @@
         <span class="uuid">{{ match.model.file_id }}</span>
       </div>
       <div class="data-row sub-item">
-        {{ match.model.file_name }}
+        {{ match.model.file_name || 'Prefix search' }}
       </div>
     </div>
   </div>