diff --git a/src/applications/search/controller/PhabricatorSearchSelectController.php b/src/applications/search/controller/PhabricatorSearchSelectController.php
index 0d6bbc30b0..3477614bd5 100644
--- a/src/applications/search/controller/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/PhabricatorSearchSelectController.php
@@ -17,9 +17,7 @@ final class PhabricatorSearchSelectController
     $user = $request->getUser();
 
     $query = new PhabricatorSearchQuery();
-
     $query_str = $request->getStr('query');
-    $matches = array();
 
     $query->setQuery($query_str);
     $query->setParameter('type', $this->type);
diff --git a/src/applications/search/engine/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
index e7f0b693bc..106eac6ec2 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineElastic.php
+++ b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
@@ -97,7 +97,7 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
     $spec = array();
     $filter = array();
 
-    if ($query->getQuery()) {
+    if ($query->getQuery() != '') {
       $spec[] = array(
         'field' => array(
           'field.corpus' => $query->getQuery(),
@@ -156,15 +156,14 @@ final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
 
     if ($filter) {
       $filter = array('filter' => array('and' => $filter));
-      if ($spec) {
-        $spec = array(
-          'query' => array(
-            'filtered' => $spec + $filter,
-          ),
-        );
-      } else {
-        $spec = $filter;
+      if (!$spec) {
+        $spec = array('query' => array('match_all' => new stdClass()));
       }
+      $spec = array(
+        'query' => array(
+          'filtered' => $spec + $filter,
+        ),
+      );
     }
 
     if (!$query->getQuery()) {