diff --git a/smartqueue_domain.info b/smartqueue_domain.info
index c745665..ae46ae9 100755
--- a/smartqueue_domain.info
+++ b/smartqueue_domain.info
@@ -1,7 +1,7 @@
 name = Smartqueue domain
 description = Provides a Nodequeue for each enabled domain.
 package = Nodequeue
-core = 7.x
+core = 6.x
 dependencies[] = domain
 dependencies[] = nodequeue
 
@@ -10,3 +10,10 @@ files[] = smartqueue_domian.views.inc
 
 ; Views Handlers
 files[] = smartqueue_domain_handler_filter_in_domain.inc
+
+
diff --git a/smartqueue_domain.module b/smartqueue_domain.module
index 931f70a..2178301 100755
--- a/smartqueue_domain.module
+++ b/smartqueue_domain.module
@@ -35,8 +35,7 @@ function smartqueue_domain_init(){
 function smartqueue_domian_get_sqid_map() {
   static $map = array();
   if (!$map) {
-    $result = db_select('nodequeue_subqueue', 'n')
-      ->fields('n', array('sqid', 'title'))->execute();
+    $result = db_query('select sqid, title from nodequeue_subqueue');
     while ($get = $result->fetchObject()) {
       $map[$get->title] = $get->sqid;
     }
@@ -47,15 +46,9 @@ function smartqueue_domian_get_sqid_map() {
 function smartqueue_domian_get_all_sqids($page_size = 0, $pager_element = 0, $bypass_cache = FALSE) {
   $cache = &drupal_static(__FUNCTION__, array());
   if ($bypass_cache || empty($cache[$page_size])) {
-    $query = db_select('nodequeue_subqueue', 'nsq')
-      ->fields('nsq', array('sqid'));
-    if (!empty($page_size)) {
-      $query->extend('PagerDefault')
-        ->extend('TableSort')
-        ->limit($page_size)
-        ->element($pager_element);
-    }
-    $qids = $query->execute()->fetchAllKeyed(0, 0);
+    $query = db_query('select sqid from nodequeue_subqueue');
+    
+    $qids = $query->fetchAll();
     $cache[$page_size] = $qids;
   }
   return $cache[$page_size];
@@ -107,8 +100,7 @@ function smartqueue_domain_check_subqueues(&$queue) {
 function smartqueue_domain_views_check_subqueue($queue) {
   $domain = domain_get_domain();
   $queue_info = explode(':', $queue->reference);
-  $domain_name = $queue_info[2];
-  if ($domain['sitename'] == $domain_name) {
+  if ($domain['domain_id'] == $queue_info[3]) {
     return true;
   }
   return false;
diff --git a/smartqueue_domain.views.inc b/smartqueue_domain.views.inc
index b490b01..889744c 100755
--- a/smartqueue_domain.views.inc
+++ b/smartqueue_domain.views.inc
@@ -1,10 +1,21 @@
 <?php
-
+function smartqueue_domain_views_handlers() {
+  return array(
+  'info' => array(
+    'path' => drupal_get_path('module', 'smartqueue_domain'),
+    ),
+    'handlers' => array(
+      'smartqueue_domain_handler_filter_in_domain' => array(
+        'parent' => 'views_handler_filter_boolean_operator',
+      ),
+    ),
+  );
+}
 function smartqueue_domain_views_data() {
   $data = array();
-  $data['nodequeue_nodes']['in_domian'] = array(
+  $data['nodequeue_nodes']['in_domain'] = array(
     'title' => t('In Domian'),
-    'help' => t('Filter to ensure a node IS or IS NOT in the current Domian'),
+    'help' => t('Filter to ensure a node IS or IS NOT in the current Domain'),
     'filter' => array(
     'handler' => 'smartqueue_domain_handler_filter_in_domain',
     'label' => t('In Domain'),
diff --git a/smartqueue_domain_handler_filter_in_domain.inc b/smartqueue_domain_handler_filter_in_domain.inc
index 3ffaac0..1e26b7c 100755
--- a/smartqueue_domain_handler_filter_in_domain.inc
+++ b/smartqueue_domain_handler_filter_in_domain.inc
@@ -20,6 +20,7 @@ class smartqueue_domain_handler_filter_in_domain extends views_handler_filter_bo
         $sqid[] = $subqueue->sqid;
       }
     }
-    $this->query->add_where($this->options['group'], $this->table_alias . ".sqid",  $sqid, "IN");
+    $sqid = implode( ',', $sqid);
+    $this->query->add_where($this->query->set_where_group('AND'), $this->table_alias . ".sqid IN ($sqid)");
   }
 }