diff --git a/stormattribute/stormattribute.admin.inc b/stormattribute/stormattribute.admin.inc
index 7c1c5ce..2808a3f 100644
--- a/stormattribute/stormattribute.admin.inc
+++ b/stormattribute/stormattribute.admin.inc
@@ -43,19 +43,19 @@ function stormattribute_list() {
   $args = array();
   $filterfields = array();
 
-  if (isset($_SESSION['stormattribute_list_filter']['domain'])) {
+  if (isset($_SESSION['stormattribute_list_filter']['domain']) && $_SESSION['stormattribute_list_filter']['domain'] != '') {
     $where[] = "domain='%s'";
     $args[] = $_SESSION['stormattribute_list_filter']['domain'];
     $filterfields[] = t('Domain');
   }
 
-  if (isset($_SESSION['stormattribute_list_filter']['akey'])) {
+  if (isset($_SESSION['stormattribute_list_filter']['akey']) && $_SESSION['stormattribute_list_filter']['akey'] != '') {
     $where[] = "LOWER(akey) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormattribute_list_filter']['akey'];
     $filterfields[] = t('Key');
   }
 
-  if (isset($_SESSION['stormattribute_list_filter']['avalue'])) {
+  if (isset($_SESSION['stormattribute_list_filter']['avalue']) && $_SESSION['stormattribute_list_filter']['avalue'] != '') {
     $where[] = "LOWER(avalue) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormattribute_list_filter']['avalue'];
     $filterfields[] = t('Value');
diff --git a/stormexpense/stormexpense.admin.inc b/stormexpense/stormexpense.admin.inc
index c5cd849..f8d51e6 100644
--- a/stormexpense/stormexpense.admin.inc
+++ b/stormexpense/stormexpense.admin.inc
@@ -96,27 +96,27 @@ function stormexpense_list() {
   $args = array();
   $filterfields = array();
 
-  if (isset($_SESSION['stormexpense_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['organization_nid']) && $_SESSION['stormexpense_list_filter']['organization_nid'] != 0) {
     $where[] = 'sex.organization_nid=%d';
     $args[] = $_SESSION['stormexpense_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['project_nid'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['project_nid']) && $_SESSION['stormexpense_list_filter']['project_nid'] != 0) {
     $where[] = 'sex.project_nid=%d';
     $args[] = $_SESSION['stormexpense_list_filter']['project_nid'];
     $filterfields[] = 'Project';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['task_nid'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['task_nid']) && $_SESSION['stormexpense_list_filter']['task_nid'] != 0) {
     $where[] = 'sex.task_nid=%d';
     $args[] = $_SESSION['stormexpense_list_filter']['task_nid'];
     $filterfields[] = 'Task';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['ticket_nid'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['ticket_nid']) && $_SESSION['stormexpense_list_filter']['ticket_nid'] != 0) {
     $where[] = 'sex.ticket_nid=%d';
     $args[] = $_SESSION['stormexpense_list_filter']['ticket_nid'];
     $filterfields[] = 'Ticket';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['datefrom'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['datefrom']) && $_SESSION['stormexpense_list_filter']['datefrom']['day'] != -1) {
     $datefrom = $_SESSION['stormexpense_list_filter']['datefrom'];
     $datefrom['hour'] = 0;
     $datefrom['minute'] = 0;
@@ -124,20 +124,12 @@ function stormexpense_list() {
     $args[] = _storm_datetime_to_gmtimestamp($datefrom);
     $filterfields[] = 'Date';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['dateto'])) {
-    $dateto = $_SESSION['stormexpense_list_filter']['dateto'];
-    $dateto['hour'] = 23;
-    $dateto['minute'] = 59;
-    $where[] = 'sex.expensedate<=%d';
-    $args[] = _storm_datetime_to_gmtimestamp($dateto);
-    $filterfields[] = 'Date';
-  }
-  if (isset($_SESSION['stormexpense_list_filter']['title'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['title']) && $_SESSION['stormexpense_list_filter']['title'] != '') {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormexpense_list_filter']['title'];
     $filterfields[] = 'Title';
   }
-  if (isset($_SESSION['stormexpense_list_filter']['provider_title'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['provider_title']) && $_SESSION['stormexpense_list_filter']['provider_title'] != '') {
     $where[] = "LOWER(sex.provider_title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormexpense_list_filter']['provider_title'];
     $filterfields[] = 'Provider';
@@ -145,9 +137,9 @@ function stormexpense_list() {
 
   $itemsperpage = isset($_SESSION['stormexpense_list_filter']['itemsperpage']) ? $_SESSION['stormexpense_list_filter']['itemsperpage'] : variable_get('storm_default_items_per_page', 10);
 
-  if (isset($_SESSION['stormexpense_list_filter']['user'])) {
+  if (isset($_SESSION['stormexpense_list_filter']['user']) && $_SESSION['stormexpense_list_filter']['user'] != '') {
     $expenseuser = user_load(array('name' => $_SESSION['stormexpense_list_filter']['user']));
-    if (!$expenseuser->uid) $expenseuser->uid =  -1;
+    if ($expenseuser === FALSE) $expenseuser->uid = -1;
     $where[] = 'n.uid=%d';
     $args[] = $expenseuser->uid;
     $filterfields[] = 'User';
@@ -298,8 +290,9 @@ function stormexpense_list_filter(&$form_state, $filterdesc = 'Filter') {
   );
 
   $form['filter']['group2']['datefrom'] = array(
-    '#type' => 'date',
+    '#type' => 'dateext',
     '#title' => t('Date from'),
+    '#withnull' => true,
     '#default_value' => $datefrom,
   );
 
diff --git a/storminvoice/storminvoice.admin.inc b/storminvoice/storminvoice.admin.inc
index cf11632..8884134 100644
--- a/storminvoice/storminvoice.admin.inc
+++ b/storminvoice/storminvoice.admin.inc
@@ -78,12 +78,12 @@ function storminvoice_list() {
   $args = array();
   $filterfields = array();
 
-  if (isset($_SESSION['storminvoice_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['storminvoice_list_filter']['organization_nid']) && $_SESSION['storminvoice_list_filter']['organization_nid'] != 0) {
     $where[] = 'sin.organization_nid=%d';
     $args[] = $_SESSION['storminvoice_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
-  if (isset($_SESSION['storminvoice_list_filter']['project_nid'])) {
+  if (isset($_SESSION['storminvoice_list_filter']['project_nid']) && $_SESSION['storminvoice_list_filter']['project_nid'] != 0) {
     $where[] = 'sin.project_nid=%d';
     $args[] = $_SESSION['storminvoice_list_filter']['project_nid'];
     $filterfields[] = 'Project';
@@ -94,7 +94,7 @@ function storminvoice_list() {
     $args[] = _storm_date_to_gmtimestamp($reqdatefrom);
     $filterfields[] = 'Request Date';
   }
-  if (isset($_SESSION['storminvoice_list_filter']['reqdateto'])) {
+  if (isset($_SESSION['storminvoice_list_filter']['reqdateto']) && $_SESSION['storminvoice_list_filter']['reqdateto']['day'] != -1) {
     $reqdateto = $_SESSION['storminvoice_list_filter']['reqdateto'];
     $where[] = 'sin.requestdate<=%d';
     $args[] = _storm_date_to_gmtimestamp($reqdateto);
@@ -250,12 +250,14 @@ function storminvoice_list_filter(&$form_state, $filterdesc = 'Filter') {
   $form['filter']['group2']['reqdatefrom'] = array(
     '#type' => 'dateext',
     '#title' => t('Req. date from'),
+    '#withnull' => true,
     '#default_value' => $reqdatefrom,
   );
 
   $form['filter']['group2']['reqdateto'] = array(
     '#type' => 'dateext',
     '#title' => t('Req. date to'),
+    '#withnull' => true,
     '#default_value' => $reqdateto,
   );
 
diff --git a/stormnote/stormnote.admin.inc b/stormnote/stormnote.admin.inc
index 44ecd68..f712399 100644
--- a/stormnote/stormnote.admin.inc
+++ b/stormnote/stormnote.admin.inc
@@ -74,22 +74,22 @@ function stormnote_list() {
   $args = array();
   $filterfields = array();
 
-  if (isset($_SESSION['stormnote_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormnote_list_filter']['organization_nid']) && $_SESSION['stormnote_list_filter']['organization_nid'] != 0) {
     $where[] = 'sno.organization_nid=%d';
     $args[] = $_SESSION['stormnote_list_filter']['organization_nid'];
     $filterfields[] = 'Organization';
   }
-  if (isset($_SESSION['stormnote_list_filter']['project_nid'])) {
+  if (isset($_SESSION['stormnote_list_filter']['project_nid']) && $_SESSION['stormnote_list_filter']['project_nid'] != 0) {
     $where[] = 'sno.project_nid=%d';
     $args[] = $_SESSION['stormnote_list_filter']['project_nid'];
     $filterfields[] = 'Project';
   }
-  if (isset($_SESSION['stormnote_list_filter']['task_nid'])) {
+  if (isset($_SESSION['stormnote_list_filter']['task_nid']) && $_SESSION['stormnote_list_filter']['task_nid'] != 0) {
     $where[] = 'sno.task_nid=%d';
     $args[] = $_SESSION['stormnote_list_filter']['task_nid'];
     $filterfields[] = 'Task';
   }
-  if (isset($_SESSION['stormnote_list_filter']['title'])) {
+  if (isset($_SESSION['stormnote_list_filter']['title']) && $_SESSION['stormnote_list_filter']['title'] != '') {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormnote_list_filter']['title'];
     $filterfields[] = 'Title';
diff --git a/stormorganization/stormorganization.admin.inc b/stormorganization/stormorganization.admin.inc
index bf0b706..6f517e8 100644
--- a/stormorganization/stormorganization.admin.inc
+++ b/stormorganization/stormorganization.admin.inc
@@ -48,7 +48,7 @@ function stormorganization_list() {
     $filterfields[] = t('Country');
   }
   
-  if (isset($_SESSION['stormorganization_list_filter']['name'])) {
+  if (isset($_SESSION['stormorganization_list_filter']['name']) && $_SESSION['stormorganization_list_filter']['name'] != '') {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormorganization_list_filter']['name'];
     $filterfields[] = t('Name');
diff --git a/stormperson/stormperson.admin.inc b/stormperson/stormperson.admin.inc
index a633dea..30ca832 100644
--- a/stormperson/stormperson.admin.inc
+++ b/stormperson/stormperson.admin.inc
@@ -44,12 +44,12 @@ 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 (isset($_SESSION['stormperson_list_filter']['organization_nid'])) {
+  if (isset($_SESSION['stormperson_list_filter']['organization_nid']) && $_SESSION['stormperson_list_filter']['organization_nid'] != 0) {
     $where[] = 'spe.organization_nid=%d';
     $args[] = $_SESSION['stormperson_list_filter']['organization_nid'];
     $filterfields[] = t('Organization');
   }
-  if (isset($_SESSION['stormperson_list_filter']['name'])) {
+  if (isset($_SESSION['stormperson_list_filter']['name']) && $_SESSION['stormperson_list_filter']['name'] != '') {
     $where[] = "LOWER(n.title) LIKE LOWER('%%%s%%')";
     $args[] = $_SESSION['stormperson_list_filter']['name'];
     $filterfields[] = t('Name');
diff --git a/stormteam/stormteam.module b/stormteam/stormteam.module
index 05461c3..62e4e27 100644
--- a/stormteam/stormteam.module
+++ b/stormteam/stormteam.module
@@ -507,14 +507,14 @@ function stormteam_list() {
   $args = array();
   $filterfields = array();
 
-  if ($_SESSION['stormteam_list_filter']['name']) {
+  if (isset($_SESSION['stormteam_list_filter']['name']) && $_SESSION['stormteam_list_filter']['name'] != '') {
     $where[] = "LOWER(n.title) LIKE LOWER('%s')";
     $args[] = $_SESSION['stormteam_list_filter']['name'];
     $filterfields[] = t('Team Name');
   }
 
   $itemsperpage = $_SESSION['stormteam_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (!isset($itemsperpage)) {
     // Sets value for fieldset label, does not affect filter itself.
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
   }
@@ -558,7 +558,7 @@ function stormteam_list_filter(&$form_state, $filterdesc = 'Filter') {
   $name = $_SESSION['stormteam_list_filter']['name'];
 
   $itemsperpage = $_SESSION['stormteam_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (!isset($itemsperpage)) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormteam_list_filter']['itemsperpage'] = $itemsperpage;
   }
diff --git a/stormtimetracking/stormtimetracking.admin.inc b/stormtimetracking/stormtimetracking.admin.inc
index 8d515c5..7b985a2 100644
--- a/stormtimetracking/stormtimetracking.admin.inc
+++ b/stormtimetracking/stormtimetracking.admin.inc
@@ -95,27 +95,27 @@ function stormtimetracking_list() {
   $args = array();
   $filterfields = array();
 
-  if ($_SESSION['stormtimetracking_list_filter']['organization_nid']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['organization_nid']) && $_SESSION['stormtimetracking_list_filter']['organization_nid'] != 0) {
     $where[] = 'stt.organization_nid=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['organization_nid'];
     $filterfields[] = t('Organization');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['project_nid']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['project_nid']) && $_SESSION['stormtimetracking_list_filter']['project_nid'] != 0) {
     $where[] = 'stt.project_nid=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['project_nid'];
     $filterfields[] = t('Project');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['task_nid']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['task_nid']) && $_SESSION['stormtimetracking_list_filter']['task_nid'] != 0) {
     $where[] = 'stt.task_nid=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['task_nid'];
     $filterfields[] = t('Task');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['ticket_nid']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['ticket_nid']) && $_SESSION['stormtimetracking_list_filter']['ticket_nid'] != 0) {
     $where[] = 'stt.ticket_nid=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['ticket_nid'];
     $filterfields[] = t('Ticket');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['datefrom']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['datefrom']) && $_SESSION['stormtimetracking_list_filter']['datefrom']['day'] != -1) {
     $datefrom = $_SESSION['stormtimetracking_list_filter']['datefrom'];
     $datefrom['hour'] = 0;
     $datefrom['minute'] = 0;
@@ -123,7 +123,7 @@ function stormtimetracking_list() {
     $args[] = _storm_datetime_to_gmtimestamp($datefrom);
     $filterfields[] = t('Date');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['dateto']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['dateto']) && $_SESSION['stormtimetracking_list_filter']['dateto']['day'] != -1) {
     $dateto = $_SESSION['stormtimetracking_list_filter']['dateto'];
     $dateto['hour'] = 23;
     $dateto['minute'] = 59;
@@ -131,26 +131,26 @@ function stormtimetracking_list() {
     $args[] = _storm_datetime_to_gmtimestamp($dateto);
     $filterfields[] = t('Date');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['billable'] != '-' && $_SESSION['stormtimetracking_list_filter']['billable'] != NULL) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['billable']) && $_SESSION['stormtimetracking_list_filter']['billable'] != '-') {
     $where[] = 'stt.billable=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['billable'];
     $filterfields[] = t('Billable');
   }
-  if ($_SESSION['stormtimetracking_list_filter']['billed'] != '-' && $_SESSION['stormtimetracking_list_filter']['billed'] != NULL) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['billed']) && $_SESSION['stormtimetracking_list_filter']['billed'] != '-') {
     $where[] = 'stt.billed=%d';
     $args[] = $_SESSION['stormtimetracking_list_filter']['billed'];
     $filterfields[] = t('Billed');
   }
 
   $itemsperpage = $_SESSION['stormtimetracking_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (!isset($itemsperpage)) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormtimetracking_list_filter']['itemsperpage'] =  $itemsperpage;
   }
 
-  if ($_SESSION['stormtimetracking_list_filter']['user']) {
+  if (isset($_SESSION['stormtimetracking_list_filter']['user']) && $_SESSION['stormtimetracking_list_filter']['user'] != '') {
     $trackinguser = user_load(array('name' => $_SESSION['stormtimetracking_list_filter']['user']));
-    if (!$trackinguser->uid) $trackinguser->uid = -1;
+    if ($trackinguser === FALSE) $trackinguser->uid = -1;
     $where[] = 'n.uid=%d';
     $args[] = $trackinguser->uid;
     $filterfields[] = t('User');
@@ -196,13 +196,13 @@ function stormtimetracking_list_filter(&$form_state, $filterdesc = 'Filter') {
   $task_nid = $_SESSION['stormtimetracking_list_filter']['task_nid'];
   $ticket_nid = $_SESSION['stormtimetracking_list_filter']['ticket_nid'];
   $itemsperpage = $_SESSION['stormtimetracking_list_filter']['itemsperpage'];
-  if (!$itemsperpage) {
+  if (!isset($itemsperpage)) {
     $itemsperpage = variable_get('storm_default_items_per_page', 10);
     $_SESSION['stormtimetracking_list_filter']['itemsperpage'] = $itemsperpage;
   }
 
   $datefrom = $_SESSION['stormtimetracking_list_filter']['datefrom'];
-  if (!$datefrom) {
+  if (!isset($datefrom)) {
     $datefrom = array('day' => 1,
                       'month' => format_date(time(), 'custom', 'n'),
                       'year' => format_date(time(), 'custom', 'Y'),
@@ -213,7 +213,7 @@ function stormtimetracking_list_filter(&$form_state, $filterdesc = 'Filter') {
   }
 
   $dateto = $_SESSION['stormtimetracking_list_filter']['dateto'];
-  if (!$dateto) {
+  if (!isset($dateto)) {
     $year = format_date(time(), 'custom', 'Y');
     $month = format_date(time(), 'custom', 'n');
     $day = format_date(mktime(0, 0, 0, ($month + 1), 0, $year), 'custom', 'd');
@@ -320,12 +320,14 @@ function stormtimetracking_list_filter(&$form_state, $filterdesc = 'Filter') {
   $form['filter']['group2']['datefrom'] = array(
     '#type' => 'dateext',
     '#title' => t('Date from'),
+    '#withnull' => true,
     '#default_value' => $datefrom,
   );
 
   $form['filter']['group2']['dateto'] = array(
     '#type' => 'dateext',
     '#title' => t('Date to'),
+    '#withnull' => true,
     '#default_value' => $dateto,
   );
 
