diff --git a/src/app/home/top-level-community-list/top-level-community-list.component.html b/src/app/home/top-level-community-list/top-level-community-list.component.html
index 043239e766..625cb5118d 100644
--- a/src/app/home/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home/top-level-community-list/top-level-community-list.component.html
@@ -2,7 +2,7 @@
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-object-list [config]="config" [sortConfig]="sortConfig"
-                  [objects]="topLevelCommunities" [hideGear]="false"
+                  [objects]="topLevelCommunities" [hideGear]="true"
                   (pageChange)="onPageChange($event)"
                   (pageSizeChange)="onPageSizeChange($event)"
                   (sortDirectionChange)="onSortDirectionChange($event)"
diff --git a/src/app/home/top-level-community-list/top-level-community-list.component.ts b/src/app/home/top-level-community-list/top-level-community-list.component.ts
index d54e8f5797..b0b1144e71 100644
--- a/src/app/home/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home/top-level-community-list/top-level-community-list.component.ts
@@ -57,6 +57,7 @@ export class TopLevelCommunityListComponent implements OnInit {
   }
 
   updateResults() {
+    this.topLevelCommunities = undefined;
     this.topLevelCommunities = this.cds.findAll({ currentPage: this.config.currentPage, elementsPerPage: this.config.pageSize, sort: this.sortConfig });
     this.ref.detectChanges();
   }
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index f669793b49..6fc3994a37 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -305,15 +305,18 @@ export class PaginationComponent implements OnDestroy, OnInit {
     private validateParams(page: any, pageSize: any, sortDirection: any, sortField: any) {
         let filteredPageSize = this.pageSizeOptions.find(x => x == pageSize);
         if (!isNumeric(page) || !filteredPageSize) {
-            let filteredPage = isNumeric(page) ? page : this.currentPage;
-            filteredPageSize = (filteredPageSize) ? filteredPageSize : this.pageSize;
-            this.router.navigate([{
+          let filteredPage = isNumeric(page) ? page : this.currentPage;
+          filteredPageSize = (filteredPageSize) ? filteredPageSize : this.pageSize;
+          this.router.navigate([], {
+              queryParams: {
                 pageId: this.id,
                 page: filteredPage,
                 pageSize: filteredPageSize,
                 sortDirection: sortDirection,
                 sortField: sortField
-            }]);
+              }
+            }
+          );
         } else {
             // (+) converts string to a number
             this.currentPage = +page;