diff -ur original/uc_order/uc_order.admin.inc patched/uc_order/uc_order.admin.inc
--- original/uc_order/uc_order.admin.inc	2011-03-11 18:13:32.000000000 +0200
+++ patched/uc_order/uc_order.admin.inc	2011-04-07 17:05:46.000000000 +0300
@@ -368,12 +368,6 @@
   );
 
   $address = variable_get('uc_customer_list_address', 'billing');
-  if ($address == 'shipping') {
-    $address = 'delivery';
-  }
-  else {
-    $address = 'billing';
-  }
 
   if (is_null($query)) {
     $query = db_select('uc_orders', 'o')
@@ -382,14 +376,14 @@
         'uid',
         'order_total',
         'created',
+        ($address == 'shipping' ? 'delivery' : 'billing') . '_first_name',
+        ($address == 'shipping' ? 'delivery' : 'billing') . '_last_name',
+        'order_status',
       ));
-    $o_first_name = $query->addField('o', $address . '_first_name');
-    $o_last_name = $query->addField('o', $address . '_last_name');
-    $o_order_status = $query->addField('o', 'order_status');
 
-    $os = $query->leftJoin('uc_order_statuses', 'os', 'o.order_status = os.order_status_id');
+    $query->leftJoin('uc_order_statuses', 'os', 'o.order_status = os.order_status_id');
 
-    $query->fields($os, array('title'));
+    $query->fields('os', array('title'));
     $show_status = 1;
 
     if (arg(3) == 'sort' && !is_null(arg(4))) {
@@ -398,10 +392,10 @@
 
     if (!isset($_SESSION['sort_status']) || $_SESSION['sort_status'] != 'all') {
       if (!empty($_SESSION['sort_status']) && is_string($_SESSION['sort_status'])) {
-        $query->condition($o_order_status, $_SESSION['sort_status']);
+        $query->condition('o.order_status', $_SESSION['sort_status']);
       }
       else {
-        $query->condition($o_order_status, uc_order_status_list('general', TRUE), 'IN');
+        $query->condition('o.order_status', uc_order_status_list('general', TRUE), 'IN');
       }
     }
   }
@@ -673,47 +667,47 @@
     $end_date = db_like(arg(12));
 
     $query = db_select('uc_orders', 'o');
-    $os = $query->leftJoin('uc_order_statuses', 'os', 'o.order_status = os.order_status_id');
+    $query->leftJoin('uc_order_statuses', 'os', 'o.order_status = os.order_status_id');
     $query->fields('o', array(
         'order_id',
         'order_total',
         'created',
+        'billing_first_name',
+        'billing_last_name',
+        'billing_company',
+        'delivery_first_name',
+        'delivery_last_name',
+        'delivery_company',
+        'order_status',
       ))
-      ->fields($os, array('title'));
-    $ob_first_name = $query->addField('o', 'billing_first_name', 'ob_first_name');
-    $ob_last_name = $query->addField('o', 'billing_last_name', 'ob_last_name');
-    $ob_company = $query->addField('o', 'billing_company', 'ob_company');
-    $os_first_name = $query->addField('o', 'delivery_first_name', 'os_first_name');
-    $os_last_name = $query->addField('o', 'delivery_last_name', 'os_last_name');
-    $os_company = $query->addField('o', 'delivery_company', 'os_company');
-    $o_order_status = $query->addField('o', 'order_status', 'o_order_status');
+      ->fields('os', array('title'));
 
-    $query->condition($o_order_status, uc_order_status_list('specific', TRUE), 'NOT IN')
+    $query->condition('o.order_status', uc_order_status_list('specific', TRUE), 'NOT IN')
       ->orderBy('created', 'DESC');
 
-    if ($billing_first_name !== '0' && $billing_first_name !== '%') {
-      $query->condition($ob_first_name, $billing_first_name, 'LIKE');
+    if ($billing_first_name && $billing_first_name !== '%') {
+      $query->condition('o.billing_first_name', $billing_first_name, 'LIKE');
     }
-    if ($billing_last_name !== '0' && $billing_last_name !== '%') {
-      $query->condition($ob_last_name, $billing_last_name, 'LIKE');
+    if ($billing_last_name && $billing_last_name !== '%') {
+      $query->condition('o.billing_last_name', $billing_last_name, 'LIKE');
     }
-    if ($billing_company !== '0' && $billing_company !== '%') {
-      $query->condition($ob_company, $billing_company, 'LIKE');
+    if ($billing_company && $billing_company !== '%') {
+      $query->condition('o.billing_company', $billing_company, 'LIKE');
     }
-    if ($shipping_first_name !== '0' && $shipping_first_name !== '%') {
-      $query->condition($os_first_name, $shipping_first_name, 'LIKE');
+    if ($shipping_first_name && $shipping_first_name !== '%') {
+      $query->condition('o.delivery_first_name', $shipping_first_name, 'LIKE');
     }
-    if ($shipping_last_name !== '0' && $shipping_last_name !== '%') {
-      $query->condition($os_last_name, $shipping_last_name, 'LIKE');
+    if ($shipping_last_name && $shipping_last_name !== '%') {
+      $query->condition('o.delivery_last_name', $shipping_last_name, 'LIKE');
     }
-    if ($shipping_company !== '0' && $shipping_company !== '%') {
-      $query->condition($os_company, $shipping_company, 'LIKE');
+    if ($shipping_company && $shipping_company !== '%') {
+      $query->condition('o.delivery_company', $shipping_company, 'LIKE');
     }
 
-    if ($start_date !== '0') {
+    if ($start_date) {
       $query->condition('created', $start_date, '>=');
     }
-    if ($end_date !== '0') {
+    if ($end_date) {
       $query->condition('created', $end_date, '<=');
     }
 
diff -ur original/uc_order/uc_order.module patched/uc_order/uc_order.module
--- original/uc_order/uc_order.module	2011-03-11 18:13:32.000000000 +0200
+++ patched/uc_order/uc_order.module	2011-04-07 15:46:53.000000000 +0300
@@ -119,7 +119,7 @@
     'title' => 'Orders',
     'description' => 'View and process orders.',
     'page callback' => 'uc_order_admin',
-    'page arguments' => array(NULL, NULL, FALSE),
+    'page arguments' => array(NULL, FALSE),
     'access arguments' => array('view all orders'),
     'weight' => -10,
     'file' => 'uc_order.admin.inc',