diff --git storm.module storm.module
index e5109be..7583c60 100644
--- storm.module
+++ storm.module
@@ -709,12 +709,12 @@ function storm_icon($icon, $title) {
 
   if (variable_get('storm_icons_display', TRUE) == TRUE) {
     $available = cache_get('storm:icons');
-    if ($available == 0) {
+    if (empty($available)) {
       // Cache miss
       $available = storm_icon_recache();
     }
 
-    if (in_array($icon .'.png', $available->data)) {
+    if (!empty($available) && in_array($icon .'.png', $available->data)) {
       // Standard route - display normal image
       $img_src = $base_path . variable_get('storm_icons_path', drupal_get_path('module', 'storm') .'/icons') .'/'. $icon .'.png';
       $o = '<img src="'. $img_src .'" alt="'. $title .'" title="'. $title .'" />';
diff --git stormexpense/stormexpense.module stormexpense/stormexpense.module
index 14001ef..2e52ba6 100644
--- stormexpense/stormexpense.module
+++ stormexpense/stormexpense.module
@@ -109,7 +109,7 @@ function stormexpense_access_sql($sql, $where = array()) {
 function stormexpense_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git storminvoice/storminvoice.module storminvoice/storminvoice.module
index 1e92647..75ceb0d 100644
--- storminvoice/storminvoice.module
+++ storminvoice/storminvoice.module
@@ -255,7 +255,7 @@ function storminvoice_access_sql($sql, $where = array()) {
 function storminvoice_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormknowledgebase/stormknowledgebase.module stormknowledgebase/stormknowledgebase.module
index b84d2bb..a11dbcf 100644
--- stormknowledgebase/stormknowledgebase.module
+++ stormknowledgebase/stormknowledgebase.module
@@ -95,7 +95,7 @@ function stormknowledgebase_access_sql($sql, $where = array()) {
 function stormknowledgebase_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormnote/stormnote.module stormnote/stormnote.module
index 2d4c85d..8304353 100644
--- stormnote/stormnote.module
+++ stormnote/stormnote.module
@@ -109,7 +109,7 @@ function stormnote_access_sql($sql, $where = array()) {
 function stormnote_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormorganization/stormorganization.admin.inc stormorganization/stormorganization.admin.inc
index 7f0c196..eef9324 100644
--- stormorganization/stormorganization.admin.inc
+++ stormorganization/stormorganization.admin.inc
@@ -42,57 +42,74 @@ function stormorganization_list() {
   $args = array();
   $filterfields = array();
 
-  $country = $_SESSION['stormorganization_list_filter']['country'];
-  if ($country && $country!='-') {
-    $where[] = "sor.country='%s'";
-    $args[] = $_SESSION['stormorganization_list_filter']['country'];
-    $filterfields[] = t('Country');
+  
+  if (!empty($_SESSION['stormorganization_list_filter']['country'])) {
+    $country = $_SESSION['stormorganization_list_filter']['country'];
+    if ($country != '-') {
+      $where[] = "sor.country='%s'";
+      $args[] = $_SESSION['stormorganization_list_filter']['country'];
+      $filterfields[] = t('Country');
+    }
   }
   
-  if ($_SESSION['stormorganization_list_filter']['name']) {
+  if (!empty($_SESSION['stormorganization_list_filter']['name'])) {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormorganization_list_filter']['name'];
     $filterfields[] = t('Name');
   }
 
-  $iscustomer = $_SESSION['stormorganization_list_filter']['iscustomer'];
-  if ($iscustomer && $iscustomer!='-') {
-    if ($iscustomer=='yes') {
+  while (!empty($_SESSION['stormorganization_list_filter']['iscustomer'])) {
+    switch($_SESSION['stormorganization_list_filter']['iscustomer']) {
+    case 'yes' :
       $where[] = "sor.iscustomer=1";
-    }
-    else if ($iscustomer=='no') {
+      break;
+    case 'no' :
       $where[] = "sor.iscustomer=0";
+      break;
+    default:
+      break 2;
     }
     $filterfields[] = t('Customer');
+    break;
   }
 
-  $isprovider = $_SESSION['stormorganization_list_filter']['isprovider'];
-  if ($isprovider && $isprovider!='-') {
-    if ($isprovider=='yes') {
+  while (!empty($_SESSION['stormorganization_list_filter']['isprovider'])) {
+    switch($_SESSION['stormorganization_list_filter']['isprovider']) {
+    case 'yes':
       $where[] = "sor.isprovider=1";
-    }
-    else if ($isprovider=='no') {
+      break;
+    case 'no':
       $where[] = "sor.isprovider=0";
+      break;
+    default:
+      break 2;
     }
     $filterfields[] = t('Provider');
+    break;
   }
 
-  $isactive = $_SESSION['stormorganization_list_filter']['isactive'];
-  if ($isactive && $isactive!='-') {
-    if ($isactive=='yes') {
+  while (!empty($_SESSION['stormorganization_list_filter']['isactive'])) {
+    switch($_SESSION['stormorganization_list_filter']['isactive']) {
+    case 'yes' :
       $where[] = "sor.isactive=1";
-    }
-    else if ($isactive=='no') {
+      break;
+    case 'no' :
       $where[] = "sor.isactive=0";
+      break;
+    default:
+      break 2;
     }
     $filterfields[] = t('Active');
+    break;
   }
 
-  $itemsperpage = $_SESSION['stormorganization_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormorganization_list_filter']['itemsperpage'])) {
     // Sets value for fieldset label, does not affect filter itself.
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
   }
+  else {
+    $itemsperpage = $_SESSION['stormorganization_list_filter']['itemsperpage'];
+  }
   
   if (count($filterfields) == 0) {
     $filterdesc = t('Not filtered');
@@ -121,25 +138,36 @@ function stormorganization_list() {
 
 function stormorganization_list_filter(&$form_state, $filterdesc = 'Filter') {
   $country_list = stormattribute_attributes_bydomain('Country');
-  $country = $_SESSION['stormorganization_list_filter']['country'];
-  if (!$country) {
+  if (empty($_SESSION['stormorganization_list_filter']['country'])) {
     $country = '-';
     $_SESSION['stormorganization_list_filter']['country'] = $country;
   }
-
+  else {
+    $country = $_SESSION['stormorganization_list_filter']['country'];
+  }
+  $_SESSION['stormorganization_list_filter'] += array(
+    'name' => NULL,
+    'iscustomer' => '-',
+    'isprovider' => '-',
+  );
   $name = $_SESSION['stormorganization_list_filter']['name'];
   $iscustomer = $_SESSION['stormorganization_list_filter']['iscustomer'];
   $isprovider = $_SESSION['stormorganization_list_filter']['isprovider'];
-  $isactive = $_SESSION['stormorganization_list_filter']['isactive'];
-  if (!$isactive) {
+  if (empty($_SESSION['stormorganization_list_filter']['isactive'])) {
     $isactive = 'yes';
     $_SESSION['stormorganization_list_filter']['isactive'] = $isactive;
   }
-  $itemsperpage = $_SESSION['stormorganization_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  else {
+    $isactive = $_SESSION['stormorganization_list_filter']['isactive'];
+  }
+
+  if (empty($_SESSION['stormorganization_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormorganization_list_filter']['itemsperpage'] = $itemsperpage;
   }
+  else {
+    $itemsperpage = $_SESSION['stormorganization_list_filter']['itemsperpage'];
+  }
 
   $form = array();
 
diff --git stormorganization/stormorganization.module stormorganization/stormorganization.module
index 2775a92..dd527e1 100644
--- stormorganization/stormorganization.module
+++ stormorganization/stormorganization.module
@@ -105,7 +105,7 @@ function stormorganization_access_sql($sql, $where = array()) {
 function stormorganization_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormorganization/stormorganization.theme.inc stormorganization/stormorganization.theme.inc
index 2be2fea..be08dc3 100644
--- stormorganization/stormorganization.theme.inc
+++ stormorganization/stormorganization.theme.inc
@@ -18,7 +18,9 @@ function theme_stormorganization_list($header, $organizations) {
 
     $rows[] = array(
       l($organization->title, 'node/'. $organization->nid),
-      check_plain($countries['values'][$organization->country]),
+      isset($countries['values'][$organization->country]) ?
+      check_plain($countries['values'][$organization->country]) :
+      check_plain($organization->country),
       array(
         'data' => storm_icon_edit_node($n, $_GET) .'&nbsp;'. storm_icon_delete_node($n, $_GET),
         'class' => 'storm_list_operations',
diff --git stormperson/stormperson.admin.inc stormperson/stormperson.admin.inc
index e057299..c1da04d 100644
--- stormperson/stormperson.admin.inc
+++ stormperson/stormperson.admin.inc
@@ -10,8 +10,11 @@ function stormperson_list() {
   $breadcrumb[] = l(t('Storm'), 'storm');
   drupal_set_breadcrumb($breadcrumb);
 
-  if (array_key_exists('organization_nid', $_GET) &&
-    ($_SESSION['stormperson_list_filter']['organization_nid'] != $_GET['organization_nid'])) {
+  if ( isset($_GET['organization_nid']) &&
+       ( empty($_SESSION['stormperson_list_filter']['organization_nid']) ||
+	 ( $_SESSION['stormperson_list_filter']['organization_nid'] != $_GET['organization_nid'])
+       )
+     ) {
     $_SESSION['stormperson_list_filter']['organization_nid'] = $_GET['organization_nid'];
   }
 
@@ -19,7 +22,7 @@ function stormperson_list() {
   $i->type = 'stormperson';
 
   $params = $_GET;
-  if ($_SESSION['stormperson_list_filter']['organization_nid']) {
+  if (!empty($_SESSION['stormperson_list_filter']['organization_nid'])) {
     $params['organization_nid'] = $_SESSION['stormperson_list_filter']['organization_nid'];
   }
 
@@ -47,23 +50,25 @@ function stormperson_list() {
   $filterfields = array();
 
   $s  = "SELECT n.*, spe.* FROM {node} AS n INNER JOIN {stormperson} AS spe ON n.vid=spe.vid WHERE n.status=1 AND n.type='stormperson' ";
-  if ($_SESSION['stormperson_list_filter']['organization_nid']) {
+  if (!empty($_SESSION['stormperson_list_filter']['organization_nid'])) {
     $where[] = 'spe.organization_nid=%d';
     $args[] = $_SESSION['stormperson_list_filter']['organization_nid'];
     $filterfields[] = t('Organization');
   }
-  if ($_SESSION['stormperson_list_filter']['name']) {
+  if (!empty($_SESSION['stormperson_list_filter']['name'])) {
     $where[] = "LOWER(n.title) LIKE LOWER('%%%s%%')";
     $args[] = $_SESSION['stormperson_list_filter']['name'];
     $filterfields[] = t('Name');
   }
-  $itemsperpage = $_SESSION['stormperson_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormperson_list_filter']['itemsperpage'])) {
     // Sets $itemsperpage for fieldset label, but this section does not control storing of session variable.
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
   }
+  else {
+    $itemsperpage = $_SESSION['stormperson_list_filter']['itemsperpage'];
+  }
   
-  if (count($filterfields) == 0) {
+  if (empty($filterfields)) {
     $filterdesc = t('Not filtered');
   }
   else {
@@ -85,19 +90,25 @@ function stormperson_list() {
   }
 
   $o .= theme('stormperson_list', $header, $people);
-  $o .= theme('pager', NULL, $itemperpage, 0);
+  $o .= theme('pager', NULL, $itemsperpage, 0);
   print theme('page', $o);
 }
 
 function stormperson_list_filter(&$form_state, $filterdesc = 'Filter') {
+  $_SESSION['stormperson_list_filter'] += array(
+    'organization_nid' => 0,
+    'name' => '',
+  );
   $organization_nid = $_SESSION['stormperson_list_filter']['organization_nid'];
   $name = $_SESSION['stormperson_list_filter']['name'];
 
-  $itemsperpage = $_SESSION['stormperson_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormperson_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormperson_list_filter']['itemsperpage'] = $itemsperpage;
   }
+  else {
+    $itemsperpage = $_SESSION['stormperson_list_filter']['itemsperpage'];
+  }
 
   $form = array();
 
diff --git stormperson/stormperson.module stormperson/stormperson.module
index 99b87fd..1511f20 100644
--- stormperson/stormperson.module
+++ stormperson/stormperson.module
@@ -149,7 +149,7 @@ function stormperson_access_sql($sql, $where = array()) {
 function stormperson_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormproject/stormproject.admin.inc stormproject/stormproject.admin.inc
index 92f53ec..57c889c 100644
--- stormproject/stormproject.admin.inc
+++ stormproject/stormproject.admin.inc
@@ -10,10 +10,12 @@ function stormproject_list() {
   $breadcrumb[] = l(t('Storm'), 'storm');
   drupal_set_breadcrumb($breadcrumb);
 
-  if (array_key_exists('organization_nid', $_GET)) {
-    if ($_SESSION['stormproject_list_filter']['organization_nid'] != $_GET['organization_nid']) {
-      $_SESSION['stormproject_list_filter']['organization_nid'] = $_GET['organization_nid'];
-    }
+  if ( isset($_GET['organization_nid']) &&
+       ( empty($_SESSION['stormproject_list_filter']['organization_nid']) ||
+	 ( $_SESSION['stormproject_list_filter']['organization_nid'] != $_GET['organization_nid'] )
+       )
+     ) {
+    $_SESSION['stormproject_list_filter']['organization_nid'] = $_GET['organization_nid'];
   }
   
   $i = new stdClass();
@@ -52,30 +54,34 @@ function stormproject_list() {
   $args = array();
   $filterfields = array();
 
-  if ($_SESSION['stormproject_list_filter']['organization_nid']) {
+  if (!empty($_SESSION['stormproject_list_filter']['organization_nid'])) {
     $where[] = 'spr.organization_nid=%d';
     $args[] = $_SESSION['stormproject_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
 
-  $projectcategory = $_SESSION['stormproject_list_filter']['projectcategory'];
-  if (!$projectcategory) {
+  if (empty($_SESSION['stormproject_list_filter']['projectcategory'])) {
     $category_list = stormattribute_attributes_bydomain('project category search');
     $projectcategory = $category_list['default'];
     $_SESSION['stormproject_list_filter']['projectcategory'] = $projectcategory;
   }
+  else {
+    $projectcategory = $_SESSION['stormproject_list_filter']['projectcategory'];
+  }
   if ($projectcategory && $projectcategory != '-') {
     $where[] = "spr.projectcategory='%s'";
     $args[] = $projectcategory;
     $filterfields[] = 'Category';
   }
 
-  $projectstatus = $_SESSION['stormproject_list_filter']['projectstatus'];
-  if (!$projectstatus) {
+  if (empty($_SESSION['stormproject_list_filter']['projectstatus'])) {
     $status_list = stormattribute_attributes_bydomain('project status search');
     $projectstatus = $status_list['default'];
     $_SESSION['stormproject_list_filter']['projectstatus'] = $projectstatus;
   }
+  else {
+    $projectstatus = $_SESSION['stormproject_list_filter']['projectstatus'];
+  }
   if ($projectstatus && $projectstatus != '-') {
     $status = split(',', $projectstatus);
     $v = array();
@@ -87,20 +93,22 @@ function stormproject_list() {
     $filterfields[] = 'Status';
   }
 
-  $projectpriority = $_SESSION['stormproject_list_filter']['projectpriority'];
-  if (!$projectpriority) {
+  if (empty($_SESSION['stormproject_list_filter']['projectpriority'])) {
     $priority_list = stormattribute_attributes_bydomain('project priority search');
     $projectpriority = $priority_list['default'];
     $_SESSION['stormproject_list_filter']['projectpriority'] = $projectpriority;
   }
+  else {
+    $projectpriority = $_SESSION['stormproject_list_filter']['projectpriority'];
+  }
   if ($projectpriority && $projectpriority != '-') {
     $where[] = "spr.projectpriority='%s'";
     $args[] = $projectpriority;
     $filterfields[] = 'Priority';
   }
 
-  $datebeginfrom = $_SESSION['stormproject_list_filter']['datebeginfrom'];
-  if ($datebeginfrom) {
+  if (!empty($_SESSION['stormproject_list_filter']['datebeginfrom'])) {
+    $datebeginfrom = $_SESSION['stormproject_list_filter']['datebeginfrom'];
     $datebeginfrom['hour'] = 0;
     $datebeginfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($datebeginfrom);
@@ -111,8 +119,8 @@ function stormproject_list() {
     }
   }
 
-  $datebeginto = $_SESSION['stormproject_list_filter']['datebeginto'];
-  if ($datebeginto) {
+  if (!empty($_SESSION['stormproject_list_filter']['datebeginto'])) {
+    $datebeginto = $_SESSION['stormproject_list_filter']['datebeginto'];
     $datebeginto['hour'] = 23;
     $datebeginto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($datebeginto);
@@ -123,8 +131,8 @@ function stormproject_list() {
     }
   }
 
-  $dateendfrom = $_SESSION['stormproject_list_filter']['dateendfrom'];
-  if ($dateendfrom) {
+  if (!empty($_SESSION['stormproject_list_filter']['dateendfrom'])) {
+    $dateendfrom = $_SESSION['stormproject_list_filter']['dateendfrom'];
     $dateendfrom['hour'] = 0;
     $dateendfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($dateendfrom);
@@ -135,8 +143,8 @@ function stormproject_list() {
     }      
   }
 
-  $dateendto = $_SESSION['stormproject_list_filter']['dateendto'];
-  if ($dateendto) {
+  if (!empty($_SESSION['stormproject_list_filter']['dateendto'])) {
+    $dateendto = $_SESSION['stormproject_list_filter']['dateendto'];
     $dateendto['hour'] = 23;
     $dateendto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($dateendto);
@@ -147,7 +155,7 @@ function stormproject_list() {
     }
   }
 
-  if ($_SESSION['stormproject_list_filter']['assigned_to']) {
+  if (!empty($_SESSION['stormproject_list_filter']['assigned_to'])) {
     if (!is_numeric($_SESSION['stormproject_list_filter']['assigned_to'])) {
       switch ($_SESSION['stormproject_list_filter']['assigned_to']) {
         
@@ -178,22 +186,24 @@ function stormproject_list() {
     }
   }
   
-  if ($_SESSION['stormproject_list_filter']['billable'] != '-' && $_SESSION['stormproject_list_filter']['billable'] != NULL) {
+  if (!empty($_SESSION['stormproject_list_filter']['billable']) && ($_SESSION['stormproject_list_filter']['billable'] != '-')) {
     $where[] = 'spr.billable=%d';
     $args[] = $_SESSION['stormproject_list_filter']['billable'];
     $filterfields[] = t('Billable');
   }
 
-  if ($_SESSION['stormproject_list_filter']['billed'] != '-' && $_SESSION['stormproject_list_filter']['billed'] != NULL) {
+  if (!empty($_SESSION['stormproject_list_filter']['billed']) && ($_SESSION['stormproject_list_filter']['billed'] != '-')) {
     $where[] = 'spr.billed=%d';
     $args[] = $_SESSION['stormproject_list_filter']['billed'];
     $filterfields[] = t('Billed');
   }
 
-  $itemsperpage = $_SESSION['stormproject_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormproject_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
   }
+  else {
+    $itemsperpage = $_SESSION['stormproject_list_filter']['itemsperpage'];
+  }
   
   if (count($filterfields) == 0) {
     $filterdesc = t('Not filtered');
@@ -222,29 +232,34 @@ function stormproject_list() {
 }
 
 function stormproject_list_filter(&$form_state, $filterdesc = 'Filter') {
-  $organization_nid = $_SESSION['stormproject_list_filter']['organization_nid'];
-
   $category_list = stormattribute_attributes_bydomain('project category search');
-  $projectcategory = $_SESSION['stormproject_list_filter']['projectcategory'];
-
   $status_list = stormattribute_attributes_bydomain('project status search');
-  $projectstatus = $_SESSION['stormproject_list_filter']['projectstatus'];
-
   $priority_list = stormattribute_attributes_bydomain('project priority search');
-  $projectpriority = $_SESSION['stormproject_list_filter']['projectpriority'];
 
+  $_SESSION['stormproject_list_filter'] += array(
+    'assigned_to' => 0,
+    'billable' => '-',
+    'billed' => '-',
+    'datebeginfrom' => NULL,
+    'datebeginto' => NULL,
+    'dateendfrom' => NULL,
+    'dateendto' => NULL,
+    'itemsperpage' => variable_get('storm_default_items_per_page', 10),
+    'organization_nid' => 0,
+    'projectcategory' => '-',
+    'projectpriority' => '-',
+    'projectstatus' => '-',
+  );
+  $organization_nid = $_SESSION['stormproject_list_filter']['organization_nid'];
+  $projectcategory = $_SESSION['stormproject_list_filter']['projectcategory'];
+  $projectstatus = $_SESSION['stormproject_list_filter']['projectstatus'];
+  $projectpriority = $_SESSION['stormproject_list_filter']['projectpriority'];
   $datebeginfrom = $_SESSION['stormproject_list_filter']['datebeginfrom'];
   $datebeginto = $_SESSION['stormproject_list_filter']['datebeginto'];
   $dateendfrom = $_SESSION['stormproject_list_filter']['dateendfrom'];
   $dateendto = $_SESSION['stormproject_list_filter']['dateendto'];
-
   $assigned_to = $_SESSION['stormproject_list_filter']['assigned_to'];
-  
   $itemsperpage = $_SESSION['stormproject_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
-    $itemsperpage = variable_get('storm_default_items_per_page', 10);
-    $_SESSION['stormproject_list_filter']['itemsperpage'] = $itemsperpage;
-  }
 
   $form = array();
 
@@ -340,6 +355,7 @@ function stormproject_list_filter(&$form_state, $filterdesc = 'Filter') {
     '#theme' => 'storm_form_group',
   );
   
+  /* Commenting out invalid code; $node is not defined anywhere.
   // ASSIGNED TO
   $options = storm_get_assignment_options($node->organization_nid, $node->project_nid);
   $form['filter']['group4']['assigned_to'] = array(
@@ -348,6 +364,7 @@ function stormproject_list_filter(&$form_state, $filterdesc = 'Filter') {
     '#default_value' => $assigned_to,
     '#options' => $options,
   );
+  */
 
   $form['filter']['group4']['billable'] = array(
     '#type' => 'select',
diff --git stormproject/stormproject.module stormproject/stormproject.module
index ebb2ba5..50e14c1 100644
--- stormproject/stormproject.module
+++ stormproject/stormproject.module
@@ -177,7 +177,7 @@ function stormproject_access_sql($sql, $where = array()) {
 function stormproject_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormtask/stormtask.admin.inc stormtask/stormtask.admin.inc
index 61f2bc2..8316f4f 100644
--- stormtask/stormtask.admin.inc
+++ stormtask/stormtask.admin.inc
@@ -473,17 +473,18 @@ 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 ($_SESSION['stormtask_list_filter']['organization_nid']) {
+  if (!empty($_SESSION['stormtask_list_filter']['organization_nid'])) {
     $where[] = 'sta.organization_nid=%d';
     $args[] = $_SESSION['stormtask_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
-  if ($_SESSION['stormtask_list_filter']['project_nid']) {
+  if (!empty($_SESSION['stormtask_list_filter']['project_nid'])) {
     $where[] = 'sta.project_nid=%d';
     $args[] = $_SESSION['stormtask_list_filter']['project_nid'];
     $filterfields[] = 'Project';
   }
-  if ($_SESSION['stormtask_list_filter']['taskcategory'] && $_SESSION['stormtask_list_filter']['taskcategory'] != '-') {
+  if (!empty($_SESSION['stormtask_list_filter']['taskcategory']) &&
+      ( $_SESSION['stormtask_list_filter']['taskcategory'] != '-' )) {
     $category = split(',', $_SESSION['stormtask_list_filter']['taskcategory']);
     $v = array();
     foreach ($category as $item) $v[] = '%s';
@@ -493,7 +494,8 @@ function stormtask_list() {
     }
     $filterfields[] = 'Category';
   }
-  if ($_SESSION['stormtask_list_filter']['taskstatus'] && $_SESSION['stormtask_list_filter']['taskstatus'] != '-') {
+  if (!empty($_SESSION['stormtask_list_filter']['taskstatus']) &&
+      ( $_SESSION['stormtask_list_filter']['taskstatus'] != '-' )) {
     $status = split(',', $_SESSION['stormtask_list_filter']['taskstatus']);
     $v = array();
     foreach ($status as $item) $v[] = '%s';
@@ -503,7 +505,8 @@ function stormtask_list() {
     }
     $filterfields[] = 'Status';
   }
-  if ($_SESSION['stormtask_list_filter']['taskpriority'] && $_SESSION['stormtask_list_filter']['taskpriority'] != '-') {
+  if (!empty($_SESSION['stormtask_list_filter']['taskpriority']) &&
+      ( $_SESSION['stormtask_list_filter']['taskpriority'] != '-' )) {
     $priority = split(',', $_SESSION['stormtask_list_filter']['taskpriority']);
     $v = array();
     foreach ($priority as $item) $v[] = '%s';
@@ -514,8 +517,8 @@ function stormtask_list() {
     $filterfields[] = 'Priority';
   }
 
-  $datebeginfrom = $_SESSION['stormtask_list_filter']['datebeginfrom'];
-  if ($datebeginfrom) {
+  if (!empty($_SESSION['stormtask_list_filter']['datebeginfrom'])) {
+    $datebeginfrom = $_SESSION['stormtask_list_filter']['datebeginfrom'];
     $datebeginfrom['hour'] = 0;
     $datebeginfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($datebeginfrom);
@@ -526,8 +529,8 @@ function stormtask_list() {
     }
   }
 
-  $datebeginto = $_SESSION['stormtask_list_filter']['datebeginto'];
-  if ($datebeginto) {
+  if (!empty($_SESSION['stormtask_list_filter']['datebeginto'])) {
+    $datebeginto = $_SESSION['stormtask_list_filter']['datebeginto'];
     $datebeginto['hour'] = 23;
     $datebeginto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($datebeginto);
@@ -538,8 +541,8 @@ function stormtask_list() {
     }
   }
 
-  $dateendfrom = $_SESSION['stormtask_list_filter']['dateendfrom'];
-  if ($dateendfrom) {
+  if (!empty($_SESSION['stormtask_list_filter']['dateendfrom'])) {
+    $dateendfrom = $_SESSION['stormtask_list_filter']['dateendfrom'];
     $dateendfrom['hour'] = 0;
     $dateendfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($dateendfrom);
@@ -550,8 +553,8 @@ function stormtask_list() {
     }
   }
 
-  $dateendto = $_SESSION['stormtask_list_filter']['dateendto'];
-  if ($dateendto) {
+  if (!empty($_SESSION['stormtask_list_filter']['dateendto'])) {
+    $dateendto = $_SESSION['stormtask_list_filter']['dateendto'];
     $dateendto['hour'] = 23;
     $dateendto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($dateendto);
@@ -562,7 +565,7 @@ function stormtask_list() {
     }
   }
   
-  if ($_SESSION['stormtask_list_filter']['assigned_to']) {
+  if (!empty($_SESSION['stormtask_list_filter']['assigned_to'])) {
     if (!is_numeric($_SESSION['stormtask_list_filter']['assigned_to'])) {
       switch ($_SESSION['stormtask_list_filter']['assigned_to']) {
         
@@ -593,22 +596,26 @@ function stormtask_list() {
     }
   }
 
-  if ($_SESSION['stormtask_list_filter']['billable'] != '-' && $_SESSION['stormtask_list_filter']['billable'] != NULL) {
+  if (!empty($_SESSION['stormtask_list_filter']['billable']) &&
+      ( $_SESSION['stormtask_list_filter']['billable'] != '' )) {
     $where[] = 'sta.billable=%d';
     $args[] = $_SESSION['stormtask_list_filter']['billable'];
     $filterfields[] = t('Billable');
   }
 
-  if ($_SESSION['stormtask_list_filter']['billed'] != '-' && $_SESSION['stormtask_list_filter']['billed'] != NULL) {
+  if (!empty($_SESSION['stormtask_list_filter']['billed']) &&
+      ( $_SESSION['stormtask_list_filter']['billed'] != '-' )) {
     $where[] = 'sta.billed=%d';
     $args[] = $_SESSION['stormtask_list_filter']['billed'];
     $filterfields[] = t('Billed');
   }
 
-  $itemsperpage = $_SESSION['stormtask_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormtask_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
   }
+  else {
+    $itemsperpage = $_SESSION['stormtask_list_filter']['itemsperpage'];
+  }
 
   if (count($filterfields) == 0) {
     $filterdesc = t('Not filtered');
@@ -639,25 +646,42 @@ function stormtask_list() {
 
 function stormtask_list_filter(&$form_state, $filterdesc = 'Filter') {
   $category_list = stormattribute_attributes_bydomain('Task category search');
-  $taskcategory = $_SESSION['stormtask_list_filter']['taskcategory'];
-  if (!$taskcategory) {
+  if (empty($_SESSION['stormtask_list_filter']['taskcategory'])) {
     $taskcategory = $category_list['default'];
     $_SESSION['stormtask_list_filter']['taskcategory'] = $taskcategory;
   }
+  else {
+    $taskcategory = $_SESSION['stormtask_list_filter']['taskcategory'];
+  }
 
   $status_list = stormattribute_attributes_bydomain('Task status search');
-  $taskstatus = $_SESSION['stormtask_list_filter']['taskstatus'];
-  if (!$taskstatus) {
+  if (empty($_SESSION['stormtask_list_filter']['taskstatus'])) {
     $taskstatus = $status_list['default'];
     $_SESSION['stormtask_list_filter']['taskstatus'] = $taskstatus;
   }
+  else {
+    $taskstatus = $_SESSION['stormtask_list_filter']['taskstatus'];
+  }
 
   $priority_list = stormattribute_attributes_bydomain('Task priority search');
-  $taskpriority = $_SESSION['stormtask_list_filter']['taskpriority'];
-  if (!$taskpriority) {
+  if (empty($_SESSION['stormtask_list_filter']['taskpriority'])) {
     $taskpriority = $priority_list['default'];
     $_SESSION['stormtask_list_filter']['taskpriority'] = $taskpriority;
   }
+  else {
+    $taskpriority = $_SESSION['stormtask_list_filter']['taskpriority'];
+  }
+
+  $_SESSION['stormtask_list_filter'] += array(
+    'organization_nid' => 0,
+    'project_nid' => 0,
+    'datebeginfrom' => NULL,
+    'datebeginto' => NULL,
+    'dateendfrom' => NULL,
+    'dateendto' => NULL,
+    'assigned_to' => NULL,
+    'itemsperpage' => variable_get('storm_default_items_per_page', 10),
+  );
 
   $organization_nid = $_SESSION['stormtask_list_filter']['organization_nid'];
   $project_nid = $_SESSION['stormtask_list_filter']['project_nid'];
@@ -670,10 +694,6 @@ function stormtask_list_filter(&$form_state, $filterdesc = 'Filter') {
   $assigned_to = $_SESSION['stormtask_list_filter']['assigned_to'];
 
   $itemsperpage = $_SESSION['stormtask_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
-    $itemsperpage = variable_get('storm_default_items_per_page', 10);
-    $_SESSION['stormtask_list_filter']['itemsperpage'] = $itemsperpage;
-  }
 
   $form = array();
 
diff --git stormtask/stormtask.module stormtask/stormtask.module
index 71664e1..3fad7cb 100644
--- stormtask/stormtask.module
+++ stormtask/stormtask.module
@@ -164,7 +164,7 @@ function stormtask_access_sql($sql, $where = array()) {
 function stormtask_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormteam/stormteam.module stormteam/stormteam.module
index cbccd5c..62a164b 100644
--- stormteam/stormteam.module
+++ stormteam/stormteam.module
@@ -207,7 +207,7 @@ function stormteam_access_sql($sql, $where = array()) {
 function stormteam_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
@@ -486,7 +486,7 @@ function stormteam_list() {
   $args = array();
   $filterfields = array();
   
-  if ($_SESSION['stormteam_list_filter']['name']) {
+  if (!empty($_SESSION['stormteam_list_filter']['name'])) {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormteam_list_filter']['name'];
     $filterfields[] = t('Team Name');
@@ -534,14 +534,18 @@ function stormteam_list() {
  * Function to define form for setting Storm Team list filter.
  */
 function stormteam_list_filter(&$form_state, $filterdesc = 'Filter') {
+  $_SESSION['stormteam_list_filter'] += array(
+    'name' => '',
+  );
   $name = $_SESSION['stormteam_list_filter']['name'];
   
-  $itemsperpage = $_SESSION['stormteam_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormteam_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormteam_list_filter']['itemsperpage'] = $itemsperpage;
   }
-  
+  else {
+    $itemsperpage = $_SESSION['stormteam_list_filter']['itemsperpage'];
+  }  
   $form = array();
   
   $form['filter'] = array(
diff --git stormticket/stormticket.admin.inc stormticket/stormticket.admin.inc
index 8a06bf4..3e221e6 100644
--- stormticket/stormticket.admin.inc
+++ stormticket/stormticket.admin.inc
@@ -85,22 +85,23 @@ 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 ($_SESSION['stormticket_list_filter']['organization_nid']) {
+  if (!empty($_SESSION['stormticket_list_filter']['organization_nid'])) {
     $where[] = 'sti.organization_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['organization_nid'];
     $filterfields[] = t('Organization');
   }
-  if ($_SESSION['stormticket_list_filter']['project_nid']) {
+  if (!empty($_SESSION['stormticket_list_filter']['project_nid'])) {
     $where[] = 'sti.project_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['project_nid'];
     $filterfields[] = t('Project');
   }
-  if ($_SESSION['stormticket_list_filter']['task_nid']) {
+  if (!empty($_SESSION['stormticket_list_filter']['task_nid'])) {
     $where[] = 'sti.task_nid=%d';
     $args[] = $_SESSION['stormticket_list_filter']['task_nid'];
     $filterfields[] = t('Task');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketcategory'] && $_SESSION['stormticket_list_filter']['ticketcategory'] != '-') {
+  if (!empty($_SESSION['stormticket_list_filter']['ticketcategory']) &&
+      ( $_SESSION['stormticket_list_filter']['ticketcategory'] != '-' )) {
     $category = split(',', $_SESSION['stormticket_list_filter']['ticketcategory']);
     $v = array();
     foreach ($category as $item) $v[] = '%s';
@@ -110,7 +111,8 @@ function stormticket_list() {
     }
     $filterfields[] = t('Category');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketstatus'] && $_SESSION['stormticket_list_filter']['ticketstatus'] != '-') {
+  if (!empty($_SESSION['stormticket_list_filter']['ticketstatus']) &&
+      ( $_SESSION['stormticket_list_filter']['ticketstatus'] != '-' )) {
     $status = split(',', $_SESSION['stormticket_list_filter']['ticketstatus']);
     $v = array();
     foreach ($status as $item) $v[] = '%s';
@@ -120,7 +122,8 @@ function stormticket_list() {
     }
     $filterfields[] = t('Status');
   }
-  if ($_SESSION['stormticket_list_filter']['ticketpriority'] && $_SESSION['stormticket_list_filter']['ticketpriority'] != '-') {
+  if (!empty($_SESSION['stormticket_list_filter']['ticketpriority']) &&
+      ( $_SESSION['stormticket_list_filter']['ticketpriority'] != '-' )) {
     $priority = split(',', $_SESSION['stormticket_list_filter']['ticketpriority']);
     $v = array();
     foreach ($priority as $item) $v[] = '%s';
@@ -131,8 +134,8 @@ function stormticket_list() {
     $filterfields[] = t('Priority');
   }
 
-  $datebeginfrom = $_SESSION['stormticket_list_filter']['datebeginfrom'];
-  if ($datebeginfrom) {
+  if (!empty($_SESSION['stormticket_list_filter']['datebeginfrom'])) {
+    $datebeginfrom = $_SESSION['stormticket_list_filter']['datebeginfrom'];
     $datebeginfrom['hour'] = 0;
     $datebeginfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($datebeginfrom);
@@ -143,8 +146,8 @@ function stormticket_list() {
     }
   }
 
-  $datebeginto = $_SESSION['stormticket_list_filter']['datebeginto'];
-  if ($datebeginto) {
+  if (!empty($_SESSION['stormticket_list_filter']['datebeginto'])) {
+    $datebeginto = $_SESSION['stormticket_list_filter']['datebeginto'];
     $datebeginto['hour'] = 23;
     $datebeginto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($datebeginto);
@@ -155,8 +158,8 @@ function stormticket_list() {
     }
   }
 
-  $dateendfrom = $_SESSION['stormticket_list_filter']['dateendfrom'];
-  if ($dateendfrom) {
+  if (!empty($_SESSION['stormticket_list_filter']['dateendfrom'])) {
+    $dateendfrom = $_SESSION['stormticket_list_filter']['dateendfrom'];
     $dateendfrom['hour'] = 0;
     $dateendfrom['minute'] = 0;
     $t = _storm_datetime_to_gmtimestamp($dateendfrom);
@@ -167,8 +170,8 @@ function stormticket_list() {
     }
   }
 
-  $dateendto = $_SESSION['stormticket_list_filter']['dateendto'];
-  if ($dateendto) {
+  if (!empty($_SESSION['stormticket_list_filter']['dateendto'])) {
+    $dateendto = $_SESSION['stormticket_list_filter']['dateendto'];
     $dateendto['hour'] = 23;
     $dateendto['minute'] = 59;
     $t = _storm_datetime_to_gmtimestamp($dateendto);
@@ -179,14 +182,11 @@ function stormticket_list() {
     }
   }
   
-  if ($_SESSION['stormticket_list_filter']['assigned_to']) {
+  if (!empty($_SESSION['stormticket_list_filter']['assigned_to'])) {
+    $assigned_to_nid = 0;
     if (!is_numeric($_SESSION['stormticket_list_filter']['assigned_to'])) {
       switch ($_SESSION['stormticket_list_filter']['assigned_to']) {
         
-        case 'all':
-          // NO FILTER
-          break;
-        
         case 'mine':
           // CURRENT USER 
           if (!empty($user->stormperson_nid) && is_numeric($user->stormperson_nid)) {
@@ -196,8 +196,9 @@ function stormticket_list() {
           
         case 'none':
           $where[] = '(sti.assigned_nid IS NULL OR sti.assigned_nid = 0) ';
-          break;
-          
+
+        case 'all':
+        default:
       }
     }
     else {
@@ -210,23 +211,27 @@ function stormticket_list() {
     }
   }
 
-  if ($_SESSION['stormticket_list_filter']['billable'] != '-' && $_SESSION['stormticket_list_filter']['billable'] != NULL) {
+  if (!empty($_SESSION['stormticket_list_filter']['billable']) &&
+      ( $_SESSION['stormticket_list_filter']['billable'] != '-' )) {
     $where[] = 'sti.billable=%d';
     $args[] = $_SESSION['stormticket_list_filter']['billable'];
     $filterfields[] = t('Billable');
   }
 
-  if ($_SESSION['stormticket_list_filter']['billed'] != '-' && $_SESSION['stormticket_list_filter']['billed'] != NULL) {
+  if (!empty($_SESSION['stormticket_list_filter']['billed']) &&
+      ( $_SESSION['stormticket_list_filter']['billed'] != '-' )) {
     $where[] = 'sti.billed=%d';
     $args[] = $_SESSION['stormticket_list_filter']['billed'];
     $filterfields[] = t('Billed');
   }
 
-  $itemsperpage = $_SESSION['stormticket_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormticket_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormticket_list_filter']['itemsperpage'] = $itemsperpage;
   }
+  else {
+    $itemsperpage = $_SESSION['stormticket_list_filter']['itemsperpage'];
+  }
 
   if (count($filterfields)==0) {
     $filterdesc = t('Not filtered');
@@ -255,36 +260,56 @@ function stormticket_list() {
 }
 
 function stormticket_list_filter(&$form_state, $filterdesc='Filter') {
+  $_SESSION['stormticket_list_filter'] += array(
+    'organization_nid' => NULL,
+    'project_nid' => NULL,
+    'task_nid' => NULL,
+    'datebeginfrom' => NULL,
+    'dateendfrom' => NULL,
+    'datebeginto' => NULL,
+    'dateendto' => NULL,
+    'assigned_to' => NULL,
+    'billable' => '-',
+    'billed' => '-',
+  );
   $organization_nid = $_SESSION['stormticket_list_filter']['organization_nid'];
   $project_nid = $_SESSION['stormticket_list_filter']['project_nid'];
   $task_nid = $_SESSION['stormticket_list_filter']['task_nid'];
 
   $category_list = stormattribute_attributes_bydomain('ticket category search');
-  $ticketcategory = $_SESSION['stormticket_list_filter']['ticketcategory'];
-  if (!$ticketcategory) {
+  if (empty($_SESSION['stormticket_list_filter']['ticketcategory'])) {
     $ticketcategory = $category_list['default'];
     $_SESSION['stormticket_list_filter']['ticketcategory'] = $ticketcategory;
   }
+  else {
+    $ticketcategory = $_SESSION['stormticket_list_filter']['ticketcategory'];
+  }
 
   $status_list = stormattribute_attributes_bydomain('ticket status search');
-  $ticketstatus = $_SESSION['stormticket_list_filter']['ticketstatus'];
-  if (!$ticketstatus) {
+  if (empty($_SESSION['stormticket_list_filter']['ticketstatus'])) {
     $ticketstatus = $status_list['default'];
     $_SESSION['stormticket_list_filter']['ticketstatus'] = $ticketstatus;
   }
+  else {
+    $ticketstatus = $_SESSION['stormticket_list_filter']['ticketstatus'];
+  }
 
   $priority_list = stormattribute_attributes_bydomain('ticket priority search');
-  $ticketpriority = $_SESSION['stormticket_list_filter']['ticketpriority'];
-  if (!$ticketpriority) {
+  if (empty($_SESSION['stormticket_list_filter']['ticketpriority'])) {
     $ticketpriority = $priority_list['default'];
     $_SESSION['stormticket_list_filter']['ticketpriority'] = $ticketpriority;
   }
+  else {
+    $ticketpriority = $_SESSION['stormticket_list_filter']['ticketpriority'];
+  }
 
-  $itemsperpage = $_SESSION['stormticket_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (empty($_SESSION['stormticket_list_filter']['itemsperpage'])) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormticket_list_filter']['itemsperpage'] = $itemsperpage;
   }
+  else {
+    $itemsperpage = $_SESSION['stormticket_list_filter']['itemsperpage'];
+  }
 
   $datebeginfrom = $_SESSION['stormticket_list_filter']['datebeginfrom'];
   $datebeginto = $_SESSION['stormticket_list_filter']['datebeginto'];
diff --git stormticket/stormticket.module stormticket/stormticket.module
index 8b99f53..eb073b5 100644
--- stormticket/stormticket.module
+++ stormticket/stormticket.module
@@ -168,7 +168,7 @@ function stormticket_access_sql($sql, $where=array()) {
 function stormticket_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }
 
diff --git stormtimetracking/stormtimetracking.module stormtimetracking/stormtimetracking.module
index 438c86c..ae79b63 100644
--- stormtimetracking/stormtimetracking.module
+++ stormtimetracking/stormtimetracking.module
@@ -110,7 +110,7 @@ function stormtimetracking_access_sql($sql, $where = array()) {
 function stormtimetracking_storm_rewrite_where_sql($query, $primary_table, $account) {
   static $conds = array();
 
-  if ($conds[$primary_table][$account->uid]) {
+  if (isset($conds[$primary_table][$account->uid])) {
     return $conds[$primary_table][$account->uid];
   }