diff --git a/marietje/api/views.py b/marietje/api/views.py
index a124157..0853bfb 100644
--- a/marietje/api/views.py
+++ b/marietje/api/views.py
@@ -22,7 +22,7 @@ def songs(request):
     except:
         pagesize = 10
 
-    if pagesize is None or pagesize < 10 or pagesize > 100:
+    if not pagesize or pagesize < 10:
         pagesize = 10
 
     try:
@@ -65,7 +65,7 @@ def managesongs(request):
     except:
         pagesize = 10
 
-    if pagesize is None or pagesize < 10 or pagesize > 100:
+    if not pagesize or pagesize < 10:
         pagesize = 10
 
     try:
diff --git a/marietje/queues/templates/queues/queue.html b/marietje/queues/templates/queues/queue.html
index 26297bf..700c9e5 100644
--- a/marietje/queues/templates/queues/queue.html
+++ b/marietje/queues/templates/queues/queue.html
@@ -33,6 +33,8 @@
                             <option value="25">25</option>
                             <option value="50">50</option>
                             <option value="100">100</option>
+                            <option value="500">500</option>
+                            <option value="1000">1000</option>
                         </select>
                         <select class="pagenum input-mini" title="Select page number"></select>
                     </th>
diff --git a/marietje/songs/templates/songs/manage.html b/marietje/songs/templates/songs/manage.html
index 1131274..9185f0e 100644
--- a/marietje/songs/templates/songs/manage.html
+++ b/marietje/songs/templates/songs/manage.html
@@ -28,6 +28,8 @@
                         <option value="25">25</option>
                         <option value="50">50</option>
                         <option value="100">100</option>
+                        <option value="500">500</option>
+                        <option value="1000">1000</option>
                     </select>
                     <select class="pagenum input-mini" title="Select page number"></select>
                 </th>