Fix one bug in comvined feeds, a=chris

diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index c6be89a98..384fd21e3 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -1817,14 +1817,18 @@ class SocialComponent extends Component implements CrawlConstants
             $this->parent->generateCSRFToken($user_id) : "";
         $data['PAGING_QUERY'] = htmlentities(B\feedsUrl($type, $type_id,
             true, $controller_name));
+        $paging_query = $data['PAGING_QUERY'];
+        if ($view_mode == 'ungrouped') {
+            $paging_query .= "&v=ungrouped";
+        }
         $data['SCRIPT'] .= " let nextPage = initNextResultsPage($limit," .
             " {$data['TOTAL_ROWS']}, $results_per_page, ".
-            "'{$data['PAGING_QUERY']}$token_string', '', 'results-container', ".
+            "'$paging_query$token_string', '', 'results-container', ".
             "'result-batch');\n";
         if ($limit > 0) {
             $data['SCRIPT'] .= " let previousPage = initPreviousResultsPage(".
                 "$limit, {$data['TOTAL_ROWS']}, $results_per_page, ".
-                "'{$data['PAGING_QUERY']}$token_string', 'results-container', ".
+                "'$paging_query$token_string', 'results-container', ".
                 "'result-batch');\n";
         }
         if (!empty($data['REFRESH_TIMESTAMP']) && !empty($pages)) {
diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php
index 9386945fa..ff65d1afe 100644
--- a/src/views/elements/GroupfeedElement.php
+++ b/src/views/elements/GroupfeedElement.php
@@ -185,10 +185,9 @@ class GroupfeedElement extends Element implements CrawlConstants
         $is_group = !empty($data['JUST_GROUP_ID']);
         $is_page_with_comments = ($data['ELEMENT'] == 'wiki');
         $is_all_feed = !$is_thread && !$is_group && !$is_page_with_comments;
-        if ($is_all_feed) {?>
+        if ($is_all_feed && !$is_api && !$is_status) {?>
             <h2 class='feed-heading'><?=
-            tl('groupfeed_element_combined_feed') ?></h2>
-            <?php
+            tl('groupfeed_element_combined_feed') ?></h2><?php
         }
         if (!$is_api && !$is_status &&
             in_array($member_access, $can_comment)) {
@@ -428,6 +427,9 @@ class GroupfeedElement extends Element implements CrawlConstants
             </div><?php
         }
         if (!$is_api && !$is_status) {
+            if ($is_all_feed) {
+                $paging_query .= "&amp;v=ungrouped";
+            }
             $this->view->helper("pagination")->singleButtonPagination(
                 $paging_query, $data['LIMIT'], $data['RESULTS_PER_PAGE'],
                 $data['TOTAL_ROWS'], false, $logged_in);?>