diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
index 43c29cbe99..76b8d5d198 100644
--- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php
+++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
@@ -139,6 +139,7 @@ final class PhabricatorDirectoryMainController
 
     $filter = $subnav->selectFilter($this->subfilter, 'all');
 
+    $view = null;
     switch ($filter) {
       case 'all':
         $view = $this->buildFeedView(array());
diff --git a/src/applications/feed/PhabricatorFeedQuery.php b/src/applications/feed/PhabricatorFeedQuery.php
index 25a58a8eda..2c954c8b49 100644
--- a/src/applications/feed/PhabricatorFeedQuery.php
+++ b/src/applications/feed/PhabricatorFeedQuery.php
@@ -76,11 +76,15 @@ final class PhabricatorFeedQuery
   private function buildGroupClause(AphrontDatabaseConnection $conn_r) {
     return qsprintf(
       $conn_r,
-      'GROUP BY ref.chronologicalKey');
+      'GROUP BY '.($this->filterPHIDs
+        ? 'ref.chronologicalKey'
+        : 'story.chronologicalKey'));
   }
 
   protected function getPagingColumn() {
-    return 'ref.chronologicalKey';
+    return ($this->filterPHIDs
+      ? 'ref.chronologicalKey'
+      : 'story.chronologicalKey');
   }
 
   protected function getPagingValue($item) {