--- a/server/src/app/Http/Controllers/Api/ThemeController.php	Wed Nov 09 15:05:41 2016 +0100
+++ b/server/src/app/Http/Controllers/Api/ThemeController.php	Wed Nov 09 23:41:15 2016 +0100
@@ -77,7 +77,7 @@
         $qFilterParts = $filterManager->buildESFilters($filters);
         $query = $filterManager->buildQuery($qFilterParts);
 
-
+        $termSize = $limit * ($index+1);
         $esQuery = [
             'index' => config('elasticsearch.index'),
             'body' => [
@@ -90,7 +90,7 @@
                             "subjects" => [
                                 "terms" => [
                                     "field" => "subject.label_code",
-                                    "size" => $limit * ($index+1),
+                                    "size" => ($termSize==0)?2147483647:$termSize,
                                     "order" => [ $order_field => $order_dir ]
                                 ]
                             ]