diff --git includes/views/nodequeue.views.inc includes/views/nodequeue.views.inc
index 666ec45..9b77455 100644
--- includes/views/nodequeue.views.inc
+++ includes/views/nodequeue.views.inc
@@ -16,38 +16,6 @@
  * really quite simple.
  */
 
-
-
-function nodequeue_views_handlers() {
-  return array(
-  'info' => array(
-    'path' => drupal_get_path('module', 'nodequeue') . '/includes/views',
-    ),
-    'handlers' => array(
-      'nodequeue_handler_argument_subqueue_qid' => array(
-         'parent' => 'views_handler_filter_numeric',
-       ),
-      'nodequeue_handler_field_all_queues' => array(
-        'parent' => 'views_handler_field_prerender_list',
-      ),
-      'nodequeue_handler_field_all_subqueues' => array(
-        'parent' => 'nodequeue_handler_field_all_queues',
-      ),
-      'nodequeue_handler_field_links' => array(
-        'parent' => 'views_handler_field_node_link',
-      ),
-      'nodequeue_handler_field_queue_tab' => array(
-        'parent' => 'views_handler_field_node_link',
-      ),
-      'nodequeue_handler_filter_in_queue' => array(
-        'parent' => 'views_handler_filter_boolean_operator',
-      ),
-      'nodequeue_handler_relationship_nodequeue' => array(
-        'parent' => 'views_handler_relationship',
-      ),
-    ),
-  );
-}
 /**
  * Implements hook_views_data().
  */
@@ -219,7 +187,6 @@ function nodequeue_views_data() {
       'handler' => 'views_handler_argument_string',
     ),
   );
-
   return $data;
 }
 
diff --git includes/views/nodequeue.views_default.inc includes/views/nodequeue.views_default.inc
index 452fdb9..524b244 100644
--- includes/views/nodequeue.views_default.inc
+++ includes/views/nodequeue.views_default.inc
@@ -13,7 +13,7 @@ function nodequeue_views_default_views() {
     return $views;
   }
 
-  $queues = nodequeue_load_queues(nodequeue_get_all_qids(NULL));
+  $queues = nodequeue_load_queues(nodequeue_get_all_qids(0, 0, TRUE));
   foreach ($queues as $queue) {
     $view = new view;
     $view->name = "nodequeue_$queue->qid";
@@ -194,6 +194,7 @@ function nodequeue_views_default_views() {
     $view->display['block'] = $display;
     $views[$view->name] = $view;
   }
+
   return $views;
 }
 
diff --git includes/views/nodequeue_handler_relationship_nodequeue.inc includes/views/nodequeue_handler_relationship_nodequeue.inc
index 68bb462..9ef0870 100644
--- includes/views/nodequeue_handler_relationship_nodequeue.inc
+++ includes/views/nodequeue_handler_relationship_nodequeue.inc
@@ -40,7 +40,7 @@ class nodequeue_handler_relationship_nodequeue extends views_handler_relationshi
       '#title' => t('Queues'),
       '#options' => $options,
       '#default_value' => $this->options['qids'],
-      '#process' => array('expand_checkboxes', 'views_process_dependency'),
+      '#process' => array('form_process_checkboxes', 'views_process_dependency'),
       '#dependency' => array('edit-options-limit' => array(TRUE)),
     );
   }
diff --git nodequeue.info nodequeue.info
index e72d18c..4ad29d7 100644
--- nodequeue.info
+++ nodequeue.info
@@ -4,4 +4,13 @@ description = Create queues which can contain nodes in arbitrary order
 package = Nodequeue
 core = 7.x
 files[] = nodequeue.module
-
+files[] = includes/nodequeue.actions.inc
+files[] = includes/views/nodequeue_handler_argument_subqueue_qid.inc
+files[] = includes/views/nodequeue_handler_field_all_queues.inc
+files[] = includes/views/nodequeue_handler_field_all_subqueues.inc
+files[] = includes/views/nodequeue_handler_field_links.inc
+files[] = includes/views/nodequeue_handler_field_queue_tab.inc
+files[] = includes/views/nodequeue_handler_filter_in_queue.inc
+files[] = includes/views/nodequeue_handler_relationship_nodequeue.inc
+files[] = includes/views/nodequeue.views_default.inc
+files[] = includes/views/nodequeue.views.inc
diff --git nodequeue.module nodequeue.module
index b0fe74c..f7eb7e8 100755
--- nodequeue.module
+++ nodequeue.module
@@ -1662,7 +1662,7 @@ function nodequeue_get_qids($type, $account = NULL, $bypass_cache = FALSE) {
  * @param $page_size
  *   The page size to use. If 0 will be all queues.
  * @param $pager_element
- *   In the rare event this should use another pager element, set this..
+ *   In the rare event this should use another pager element, set this.
  *
  * @return $qids
  *   An array in the format: @code { array($qid => array('qid' => $qid, 'show_in_tab' '
@@ -1673,12 +1673,14 @@ function nodequeue_get_qids($type, $account = NULL, $bypass_cache = FALSE) {
 function nodequeue_get_all_qids($page_size = 25, $pager_element = 0, $bypass_cache = FALSE) {
   static $cache = NULL;
   if ($bypass_cache || !isset($cache)) {
-    $result = db_select('nodequeue_queue', 'nq')
+    $query = db_select('nodequeue_queue', 'nq')
       ->extend('PagerDefault')
       ->extend('TableSort')
-      ->fields('nq', array('qid'))
-      ->limit($page_size)
-      ->execute();
+      ->fields('nq', array('qid'));
+    if (!empty($page_size)) {
+      $query->limit($page_size);
+    }
+    $result = $query->execute();
 
     $qids = array();
     if (!empty($result)) {