diff --git a/data/model.py b/data/model.py
index 4dd6d594c..68c57284e 100644
--- a/data/model.py
+++ b/data/model.py
@@ -514,7 +514,7 @@ def get_visible_repository_internal(username=None, include_public=True, limit=No
     return []
 
   query = (Repository
-             .select(Repository, Visibility)
+             .select()  # Note: We need to leave this blank for the get_count case. Otherwise, MySQL/RDS complains.
              .distinct()
              .join(Visibility)
              .switch(Repository)
@@ -563,8 +563,7 @@ def get_visible_repository_internal(username=None, include_public=True, limit=No
       where_clause = new_clause
 
   if sort:
-    # TODO: Add the sorting clause here.
-    pass
+    query = query.order_by(Repository.description.desc())
 
   if page:
     query = query.paginate(page, limit)
diff --git a/static/js/controllers.js b/static/js/controllers.js
index 7111911aa..900a12cb8 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -99,11 +99,13 @@ function RepoListCtrl($scope, Restangular, UserService, ApiService) {
       'sort': true,
       'limit': 10,
       'page': $scope.page,
-      'count': true
+      'count': $scope.page == 1
     };
 
     $scope.public_repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
-      $scope.publicPageCount = Math.ceil(resp.count / 10);
+      if (resp.count) {
+        $scope.publicPageCount = Math.ceil(resp.count / 10);
+      }
       return resp.repositories;
     });
   };