Index: stormtask/stormtask.admin.inc
===================================================================
--- stormtask/stormtask.admin.inc	(revision 1.8.4.35)
+++ stormtask/stormtask.admin.inc	(revision )
@@ -58,8 +58,14 @@
   $where = array();
   $args = array();
 
-  if ($_SESSION['stormtask_tasks_filter']['taskcategory'] && $_SESSION['stormtask_tasks_filter']['taskcategory'] != '-') {
-    $category = split(',', $_SESSION['stormtask_tasks_filter']['taskcategory']);
+  $taskcategory = $_SESSION['stormtask_tasks_filter']['taskcategory'];
+  if (!$taskcategory) {
+    $category_list = stormattribute_attributes_bydomain('Task category search');
+    $taskcategory = $category_list['default'];
+    $_SESSION['stormtask_tasks_filter']['taskcategory'] = $taskcategory;
+  }
+  if ($taskcategory && $taskcategory != '-') {
+    $category = split(',', $taskcategory);
     $v = array();
     foreach ($category as $item) $v[] = '%s';
     $where[] = "sta.taskcategory IN ('". implode("','",$v) ."')";
@@ -67,8 +73,15 @@
       $args[] = $value;
     }
   }
-  if ($_SESSION['stormtask_tasks_filter']['taskstatus'] && $_SESSION['stormtask_tasks_filter']['taskstatus'] != '-') {
-    $status = split(',', $_SESSION['stormtask_tasks_filter']['taskstatus']);
+
+  $taskstatus = $_SESSION['stormtask_tasks_filter']['taskstatus'];
+  if (!$taskstatus) {
+    $status_list = stormattribute_attributes_bydomain('Task status search');
+    $taskstatus = $status_list['default'];
+    $_SESSION['stormtask_tasks_filter']['taskstatus'] = $taskstatus;
+  }
+  if ($taskstatus && $taskstatus != '-') {
+    $status = split(',', $taskstatus);
     $v = array();
     foreach ($status as $item) $v[] = '%s';
     $where[] = "sta.taskstatus IN ('". implode("','",$v) ."')";
@@ -76,8 +89,15 @@
       $args[] = $value;
     }
   }
-  if ($_SESSION['stormtask_tasks_filter']['taskpriority'] && $_SESSION['stormtask_tasks_filter']['taskpriority'] != '-') {
-    $priority = split(',', $_SESSION['stormtask_tasks_filter']['taskpriority']);
+
+  $taskpriority = $_SESSION['stormtask_tasks_filter']['taskpriority'];
+  if (!$taskpriority) {
+    $priority_list = stormattribute_attributes_bydomain('Task priority search');
+    $taskpriority = $priority_list['default'];
+    $_SESSION['stormtask_tasks_filter']['taskpriority'] = $taskpriority;
+  }
+  if ($taskpriority && $taskpriority != '-') {
+    $priority = split(',', $taskpriority);
     $v = array();
     foreach ($priority as $item) $v[] = '%s';
     $where[] = "sta.taskpriority IN ('". implode("','",$v) ."')";
@@ -313,24 +333,12 @@
 function stormtask_tasks_filter() {
   $category_list = stormattribute_attributes_bydomain('Task category search');
   $taskcategory = $_SESSION['stormtask_tasks_filter']['taskcategory'];
-  if (!$taskcategory) {
-    $taskcategory = $category_list['default'];
-    $_SESSION['stormtask_tasks_filter']['taskcategory'] = $taskcategory;
-  }
 
   $status_list = stormattribute_attributes_bydomain('Task status search');
   $taskstatus = $_SESSION['stormtask_tasks_filter']['taskstatus'];
-  if (!$taskstatus) {
-    $taskstatus = $status_list['default'];
-    $_SESSION['stormtask_tasks_filter']['taskstatus'] = $taskstatus;
-  }
 
   $priority_list = stormattribute_attributes_bydomain('Task priority search');
   $taskpriority = $_SESSION['stormtask_tasks_filter']['taskpriority'];
-  if (!$taskpriority) {
-    $taskpriority = $priority_list['default'];
-    $_SESSION['stormtask_tasks_filter']['taskpriority'] = $taskpriority;
-  }
 
   $form = array();
 
Index: stormknowledgebase/stormknowledgebase.admin.inc
===================================================================
--- stormknowledgebase/stormknowledgebase.admin.inc	(revision 1.2.4.11)
+++ stormknowledgebase/stormknowledgebase.admin.inc	(revision )
@@ -36,9 +36,15 @@
   $args = array();
   $filterfields = array();
 
-  if ($_SESSION['stormknowledgebase_list_filter']['topic'] && $_SESSION['stormknowledgebase_list_filter']['topic'] != '-') {
+  $topic = $_SESSION['stormknowledgebase_list_filter']['topic'];
+  if(!$topic) {
+    $topic_list = stormattribute_attributes_bydomain('Knowledge base topic');
+    $topic = $topic_list['default'];
+    $_SESSION['stormknowledgebase_list_filter']['topic'] = $topic;
+  }
+  if ($topic && $topic != '-') {
     $where[] = "skb.topic='%s'";
-    $args[] = $_SESSION['stormknowledgebase_list_filter']['topic'];
+    $args[] = $topic;
     $filterfields[] = 'Topic';
   }
   $itemsperpage = $_SESSION['stormknowledgebase_list_filter']['itemsperpage'];
@@ -76,10 +82,6 @@
 function stormknowledgebase_list_filter(&$form_state, $filterdesc = 'Filter') {
   $topic_list = stormattribute_attributes_bydomain('Knowledge base topic');
   $topic = $_SESSION['stormknowledgebase_list_filter']['topic'];
-  if(!$topic) {
-    $topic = $topic_list['default'];
-    $_SESSION['stormknowledgebase_list_filter']['topic'] = $topic;
-  }
 
   $itemsperpage = $_SESSION['stormknowledgebase_list_filter']['itemsperpage'];
   if (!$itemsperpage) {
Index: stormticket/stormticket.admin.inc
===================================================================
--- stormticket/stormticket.admin.inc	(revision 1.8.4.24)
+++ stormticket/stormticket.admin.inc	(revision )
@@ -100,8 +100,14 @@
     $args[] = $_SESSION['stormticket_list_filter']['task_nid'];
     $filterfields[] = t('Task');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketcategory'] && $_SESSION['stormticket_list_filter']['ticketcategory'] != '-') {
-    $category = split(',', $_SESSION['stormticket_list_filter']['ticketcategory']);
+  $ticketcategory = $_SESSION['stormticket_list_filter']['ticketcategory'];
+  if (!$ticketcategory) {
+    $category_list = stormattribute_attributes_bydomain('ticket category search');
+    $ticketcategory = $category_list['default'];
+    $_SESSION['stormticket_list_filter']['ticketcategory'] = $ticketcategory;
+  }
+  if ($ticketcategory && $ticketcategory != '-') {
+    $category = split(',', $ticketcategory);
     $v = array();
     foreach ($category as $item) $v[] = '%s';
     $where[] = "sti.ticketcategory IN ('". implode("','", $v) ."')";
@@ -110,8 +116,14 @@
     }
     $filterfields[] = t('Category');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketstatus'] && $_SESSION['stormticket_list_filter']['ticketstatus'] != '-') {
-    $status = split(',', $_SESSION['stormticket_list_filter']['ticketstatus']);
+  $ticketstatus = $_SESSION['stormticket_list_filter']['ticketstatus'];
+  if (!$ticketstatus) {
+    $status_list = stormattribute_attributes_bydomain('ticket status search');
+    $ticketstatus = $status_list['default'];
+    $_SESSION['stormticket_list_filter']['ticketstatus'] = $ticketstatus;
+  }
+  if ($ticketstatus && $ticketstatus != '-') {
+    $status = split(',', $ticketstatus);
     $v = array();
     foreach ($status as $item) $v[] = '%s';
     $where[] = "sti.ticketstatus IN ('". implode("','",$v) ."')";
@@ -120,8 +132,14 @@
     }
     $filterfields[] = t('Status');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketpriority'] && $_SESSION['stormticket_list_filter']['ticketpriority'] != '-') {
-    $priority = split(',', $_SESSION['stormticket_list_filter']['ticketpriority']);
+  $ticketpriority = $_SESSION['stormticket_list_filter']['ticketpriority'];
+  if (!$ticketpriority) {
+    $priority_list = stormattribute_attributes_bydomain('ticket priority search');
+    $ticketpriority = $priority_list['default'];
+    $_SESSION['stormticket_list_filter']['ticketpriority'] = $ticketpriority;
+  }
+  if ($ticketpriority && $ticketpriority != '-') {
+    $priority = split(',', $ticketpriority);
     $v = array();
     foreach ($priority as $item) $v[] = '%s';
     $where[] = "sti.ticketpriority IN ('". implode("','",$v) ."')";
@@ -261,24 +279,12 @@
 
   $category_list = stormattribute_attributes_bydomain('ticket category search');
   $ticketcategory = $_SESSION['stormticket_list_filter']['ticketcategory'];
-  if (!$ticketcategory) {
-    $ticketcategory = $category_list['default'];
-    $_SESSION['stormticket_list_filter']['ticketcategory'] = $ticketcategory;
-  }
 
   $status_list = stormattribute_attributes_bydomain('ticket status search');
   $ticketstatus = $_SESSION['stormticket_list_filter']['ticketstatus'];
-  if (!$ticketstatus) {
-    $ticketstatus = $status_list['default'];
-    $_SESSION['stormticket_list_filter']['ticketstatus'] = $ticketstatus;
-  }
 
   $priority_list = stormattribute_attributes_bydomain('ticket priority search');
   $ticketpriority = $_SESSION['stormticket_list_filter']['ticketpriority'];
-  if (!$ticketpriority) {
-    $ticketpriority = $priority_list['default'];
-    $_SESSION['stormticket_list_filter']['ticketpriority'] = $ticketpriority;
-  }
 
   $itemsperpage = $_SESSION['stormticket_list_filter']['itemsperpage'];
   if (!$itemsperpage) {