diff --git a/date_views/includes/date_views_filter_handler_simple.inc b/date_views/includes/date_views_filter_handler_simple.inc
old mode 100644
new mode 100755
index 4fa4c40..625f890
--- a/date_views/includes/date_views_filter_handler_simple.inc
+++ b/date_views/includes/date_views_filter_handler_simple.inc
@@ -100,10 +100,12 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
     // for consistency between the way filters and arguments work (arguments
     // cannot contain spaces).
     if (empty($input)) {
-      if (empty($this->options['exposed'])) {
-        return str_replace(' ', 'T', $this->date_default_value($prefix));
+      if (!empty($this->options['expose']['identifier'])) {
+        if (empty($this->options['expose'])) {
+          return str_replace(' ', 'T', $this->date_default_value($prefix));
+        }
       }
-      elseif (isset($this->options['expose']['identifier']) && !isset($_GET[$this->options['expose']['identifier']])) {
+      elseif (empty($this->options['exposed'])) {
         return str_replace(' ', 'T', $this->date_default_value($prefix));
       }
     }
@@ -131,6 +133,11 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
   }
 
   function op_between($field) {
+    $min_value = $this->get_filter_value('min', $this->value['min']);
+    $max_value = $this->get_filter_value('max', $this->value['max']);
+    if (empty($min_value) && empty($max_value)) { // TODO: Not sure if this should be && or ||
+      return;
+    }
 
     // Add the delta field to the view so we can later find the value that matched our query.
     list($table_name, $field_name) = explode('.', $field);
@@ -141,9 +148,7 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
       $this->query->add_field($table_name, 'delta', 'date_delta_' . $real_field_name);
     }
 
-    $min_value = $this->get_filter_value('min', $this->value['min']);
     $min_comp_date = new DateObject($min_value, date_default_timezone(), $this->format);
-    $max_value = $this->get_filter_value('max', $this->value['max']);
     $max_comp_date = new DateObject($max_value, date_default_timezone(), $this->format);
     $field_min = $this->date_handler->sql_field($field, NULL, $min_comp_date);
     $field_min = $this->date_handler->sql_format($this->format, $field_min);
@@ -161,6 +166,10 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
   }
 
   function op_simple($field) {
+    $value = $this->get_filter_value('value', $this->value['value']);
+    if (empty($value)) {
+      return;
+    }
 
     // Add the delta field to the view so we can later find the value that matched our query.
     list($table_name, $field_name) = explode('.', $field);
@@ -171,7 +180,6 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
       $this->query->add_field($table_name, 'delta', 'date_delta_' . $real_field_name);
     }
 
-    $value = $this->get_filter_value('value', $this->value['value']);
     $comp_date = new DateObject($value, date_default_timezone(), $this->format);
     $field = $this->date_handler->sql_field($field, NULL, $comp_date);
     $field = $this->date_handler->sql_format($this->format, $field);
@@ -181,6 +189,10 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
   }
 
   function op_contains($field) {
+    $value = $this->get_filter_value('value', $this->value['value']);
+    if (empty($value)) {
+      return;
+    }
 
     // Add the delta field to the view so we can later find the value that matched our query.
     list($table_name, $field_name) = explode('.', $field);
@@ -188,7 +200,6 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
       $this->query->add_field($table_name, 'delta');
     }
 
-    $value = $this->get_filter_value('value', $this->value['value']);
     $comp_date = new DateObject($value, date_default_timezone(), $this->format);
     $fields = date_views_fields($this->base_table);
     $fields = $fields['name'];