diff --git a/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java b/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java
index 6c061316..e991bd82 100644
--- a/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java
+++ b/src/main/java/edu/tamu/sage/service/SolrDiscoveryService.java
@@ -84,18 +84,11 @@ public DiscoveryContext buildDiscoveryContext(DiscoveryView discoveryView, Strin
             });
         }
 
-        String query = "";
-        if (search.getField().isEmpty() && search.getValue().isEmpty()) {
-            query = "*";
-        } else if (search.getField().isEmpty()) {
-            query = search.getValue();
-        } else if (search.getValue().isEmpty()) {
-            query = search.getField() + ":*";
-        } else {
-            query = search.getField() + ":" + search.getValue();
-        }
+        SolrQuery solrQuery = new SolrQuery(StringUtils.isEmpty(search.getValue()) ? "*" : search.getValue());
 
-        SolrQuery solrQuery = new SolrQuery(query);
+        if (StringUtils.isNotEmpty(search.getField())) {
+          solrQuery.add("df", search.getField());
+        }
 
         // Only filter against designated facet fields.
         List<Filter> filters = new ArrayList<Filter>();