diff --git a/stormproject/stormproject.admin.inc b/stormproject/stormproject.admin.inc
index 11697ab..e4dce7b 100644
--- a/stormproject/stormproject.admin.inc
+++ b/stormproject/stormproject.admin.inc
@@ -51,7 +51,7 @@ function stormproject_list() {
   $args = array();
   $filterfields = array();
 
-  if (isset($_SESSION['stormproject_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormproject_list_filter']['organization_nid']) && ($_SESSION['stormproject_list_filter']['organization_nid'] != 0)) {
     $where[] = 'spr.organization_nid=%d';
     $args[] = $_SESSION['stormproject_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
diff --git a/stormtask/stormtask.admin.inc b/stormtask/stormtask.admin.inc
index 700f659..23d2c43 100644
--- a/stormtask/stormtask.admin.inc
+++ b/stormtask/stormtask.admin.inc
@@ -480,12 +480,12 @@ function stormtask_list() {
   $filterfields = array();
 
   $s  = "SELECT n.*, sta.* FROM {node} AS n INNER JOIN {stormtask} AS sta ON n.vid=sta.vid WHERE n.status=1 AND n.type='stormtask' ";
-  if (isset($_SESSION['stormtask_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormtask_list_filter']['organization_nid']) && ($_SESSION['stormtask_list_filter']['organization_nid'] != 0)) {
     $where[] = 'sta.organization_nid=%d';
     $args[] = $_SESSION['stormtask_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
-  if (isset($_SESSION['stormtask_list_filter']['project_nid'])) {
+  if (isset($_SESSION['stormtask_list_filter']['project_nid']) && ($_SESSION['stormtask_list_filter']['project_nid'] != 0)) {
     $where[] = 'sta.project_nid=%d';
     $args[] = $_SESSION['stormtask_list_filter']['project_nid'];
     $filterfields[] = 'Project';
diff --git a/stormticket/stormticket.admin.inc b/stormticket/stormticket.admin.inc
index bc91e81..f840c10 100644
--- a/stormticket/stormticket.admin.inc
+++ b/stormticket/stormticket.admin.inc
@@ -84,24 +84,24 @@ function stormticket_list() {
 
   $s = "SELECT n.*, sti.* FROM  {node} AS n INNER JOIN {stormticket} AS sti ON n.vid=sti.vid WHERE n.status=1 AND n.type='stormticket' ";
   
-  if (isset($_SESSION['stormticket_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormticket_list_filter']['organization_nid']) && ($_SESSION['stormticket_list_filter']['organization_nid'] != 0)) {
     $where[] = 'sti.organization_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['organization_nid'];
     $filterfields[] = t('Organization');
   }
-  if (isset($_SESSION['stormticket_list_filter']['project_nid'])) {
+  if (isset($_SESSION['stormticket_list_filter']['project_nid']) && ($_SESSION['stormticket_list_filter']['project_nid'] != 0)) {
     $where[] = 'sti.project_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['project_nid'];
     $filterfields[] = t('Project');
   }
-  if (isset($_SESSION['stormticket_list_filter']['task_nid'])) {
+  if (isset($_SESSION['stormticket_list_filter']['task_nid']) && ($_SESSION['stormticket_list_filter']['task_nid'] != 0)) {
     $where[] = 'sti.task_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['task_nid'];
     $filterfields[] = t('Task');
   }
 
   $category_list = stormattribute_attributes_bydomain('ticket category search');
-  $ticketcategory = isset($_SESSION['stormticket_list_filter']['ticketcategory']) ? $_SESSION['stormticket_list_filter'] : $category_list['default'];
+  $ticketcategory = isset($_SESSION['stormticket_list_filter']['ticketcategory']) ? $_SESSION['stormticket_list_filter']['ticketcategory'] : $category_list['default'];
   $_SESSION['stormticket_list_filter']['ticketcategory'] = $ticketcategory;
 
   if ($ticketcategory != '-') {
@@ -192,7 +192,7 @@ function stormticket_list() {
       $filterfields[] = t('Date');
     }
   }
-  
+
   if (isset($_SESSION['stormticket_list_filter']['assigned_to'])) {
     if (!is_numeric($_SESSION['stormticket_list_filter']['assigned_to'])) {
       switch ($_SESSION['stormticket_list_filter']['assigned_to']) {