diff --git a/includes/webform.report.inc b/includes/webform.report.inc
index 9a0f99b..41f91fb 100644
--- a/includes/webform.report.inc
+++ b/includes/webform.report.inc
@@ -694,14 +694,7 @@ function webform_results_download_range_validate($element, $form_state) {
   }
 
   // Check that the range will return something at all.
-  $range_options = array(
-    'range_type' => $element['range_type']['#value'],
-    'start' => $element['start']['#value'],
-    'end' => $element['end']['#value'],
-    'latest' => $element['latest']['#value'],
-    'start_date' => $element['start_date']['#value'],
-    'end_date' => $element['end_date']['#value'],
-    'completion_type' => $element['completion_type']['#value'],
+  $range_options = $form_state['values']['range'] + array(
     'batch_size' => 1,
     'batch_number' => 0,
   );
@@ -1899,6 +1892,7 @@ function webform_download_sids_query($nid, $range_options, $uid = NULL) {
   $query = db_select('webform_submissions', 'ws')
     ->condition('nid', $nid)
     ->addTag('webform_download_sids');
+  $query->addMetaData('range_options', $range_options);
 
   switch ($range_options['range_type']) {
     case 'all':