diff --git a/includes/webform.submissions.inc b/includes/webform.submissions.inc
index 363adec..5ae6917 100644
--- a/includes/webform.submissions.inc
+++ b/includes/webform.submissions.inc
@@ -641,15 +641,14 @@
   else {
     $pager_query = db_select('webform_submissions', 'ws')
       ->addTag('webform_get_submissions_sids')
-      ->fields('ws', array('sid'));
+      ->fields('ws', array('sid', 'nid', 'submitted', 'remote_addr', 'uid', 'is_draft'));
     foreach ($filters as $column => $value) {
       $pager_query->condition($column, $value);
     }
 
-    if (isset($filters['u.uid']) || !empty($header)) {
-      // Join to the users table for sorting by user name.
-      $pager_query->leftJoin('users', 'u', 'u.uid = ws.uid');
-    }
+    // Join to the users table to include user name in results.
+    $pager_query->leftJoin('users', 'u', 'u.uid = ws.uid');
+    $pager_query->fields('u', array('name'));
 
     if (isset($filters['u.uid']) && $filters['u.uid'] === 0) {
       if (!empty($_SESSION['webform_submission'])) {
@@ -676,11 +675,19 @@
       $pager_query->limit($pager_count);
     }
     $result = $pager_query->execute();
-
+dvm('test');
     $sids = array();
     foreach ($result as $row) {
       $sids[] = $row->sid;
-      $submissions[$row->sid] = FALSE;
+      $submissions[$row->sid] = new stdClass();
+      $submissions[$row->sid]->sid = $row->sid;
+      $submissions[$row->sid]->nid = $row->nid;
+      $submissions[$row->sid]->submitted = $row->submitted;
+      $submissions[$row->sid]->remote_addr = $row->remote_addr;
+      $submissions[$row->sid]->uid = $row->uid;
+      $submissions[$row->sid]->name = $row->name;
+      $submissions[$row->sid]->is_draft = $row->is_draft;
+      $submissions[$row->sid]->data = array();
     }
   }
 
@@ -691,13 +698,9 @@
 
   // Query the required submission data.
   $query = db_select('webform_submitted_data', 'sd');
-  $query->leftJoin('webform_submissions', 's', 's.sid = sd.sid');
-  $query->leftJoin('users', 'u', 'u.uid = s.uid');
   $query
     ->addTag('webform_get_submissions_data')
-    ->fields('s')
-    ->fields('sd', array('cid', 'no', 'data'))
-    ->fields('u', array('name'))
+    ->fields('sd', array('sid', 'cid', 'no', 'data'))
     ->condition('sd.sid', $sids, 'IN')
     ->orderBy('sd.sid', 'ASC')
     ->orderBy('sd.cid', 'ASC')
@@ -712,24 +715,11 @@
   $result = $query->execute();
 
   // Convert the queried rows into submissions.
-  $previous = 0;
   foreach ($result as $row) {
-    if ($row->sid != $previous) {
-      $submissions[$row->sid] = new stdClass();
-      $submissions[$row->sid]->sid = $row->sid;
-      $submissions[$row->sid]->nid = $row->nid;
-      $submissions[$row->sid]->submitted = $row->submitted;
-      $submissions[$row->sid]->remote_addr = $row->remote_addr;
-      $submissions[$row->sid]->uid = $row->uid;
-      $submissions[$row->sid]->name = $row->name;
-      $submissions[$row->sid]->is_draft = $row->is_draft;
-      $submissions[$row->sid]->data = array();
-    }
     // CID may be NULL if this submission does not actually contain any data.
     if ($row->cid) {
       $submissions[$row->sid]->data[$row->cid][$row->no] = $row->data;
     }
-    $previous = $row->sid;
   }
 
   foreach (module_implements('webform_submission_load') as $module) {