diff --git a/abuse.module b/abuse.module
index c0d9cf8..3515e41 100644
--- a/abuse.module
+++ b/abuse.module
@@ -1144,23 +1144,27 @@ function _abuse_get_assigned_count($status = FALSE) {
     else {
       // TODO Please review the conversion of this statement to the D7 database API syntax.
       /* db_query("UPDATE {abuse_status} SET assigned_to_uid=%d WHERE (assigned_to_uid=0 OR assigned_to_uid=%d) AND (status=%d OR status=%d) ORDER BY assigned_to_uid DESC, oid DESC LIMIT %d", $user->uid, $user->uid, ABUSE_PENDING, ABUSE_HIDDEN, variable_get('abuse_num_assigned', 20)) */
+      $assigned_to_uid = db_or()
+        ->condition('assigned_to_uid', '0', '=')
+        ->condition('assigned_to_uid', $user->uid, '=');
+
+      $status = db_or()
+        ->condition('status', 'ABUSE_PENDING', '=')
+        ->condition('status', 'ABUSE_HIDDEN', '=');
+
       $query = db_update('abuse_status')
         ->fields(array(
           'assigned_to_uid' => $user->uid,
         ))
-        ->db_or()
-        ->condition('assigned_to_uid', '0', '=')
-        ->condition('assigned_to_uid', $user->uid, '=')
-        ->db_and()
-        ->db_or()
-        ->condition('status', 'ABUSE_PENDING', '=')
-        ->condition('status', 'ABUSE_HIDDEN', '=')
-        ->orderBy('assigned_to_uid', 'DESC')
-        ->orderBy('oid', 'DESC')
-        ->range(0, variable_get('abuse_num_assigned', 20));
-      var_dump($query);
+        ->condition($assigned_to_uid)
+        ->condition($status);
+      //->orderBy('assigned_to_uid', 'DESC')
+      //->orderBy('oid', 'DESC')
+      //->range(0, variable_get('abuse_num_assigned', 20));
+      //var_dump($query);
       $result = $query->execute();
- // ->where('(assigned_to_uid=0 OR assigned_to_uid=%d) AND (status=%d OR status=%d) ORDER BY assigned_to_uid DESC, oid DESC LIMIT %d',  )
+
+      // ->where('(assigned_to_uid=0 OR assigned_to_uid=%d) AND (status=%d OR status=%d) ORDER BY assigned_to_uid DESC, oid DESC LIMIT %d',  )
 // UPDATE {abuse_status}
 // SET assigned_to_uid=%d
 // WHERE (assigned_to_uid=0
@@ -1172,7 +1176,7 @@ function _abuse_get_assigned_count($status = FALSE) {
 // LIMIT %d",
 // $user->uid, $user->uid, ABUSE_PENDING, ABUSE_HIDDEN, variable_get('abuse_num_assigned', 20))
       }
-    $result = db_query("SELECT count(*) FROM {abuse_status} WHERE assigned_to_uid = :assigned_to_uid AND (status = :status OR status = :status OR status = :status)", array(':assigned_to_uid' => $user->uid, ':status' => ABUSE_PENDING, ':status' => ABUSE_HIDDEN, ':status' => ABUSE_SUPERADMIN))->fetchField();
+    //$result = db_query("SELECT count(*) FROM {abuse_status} WHERE assigned_to_uid = :assigned_to_uid AND (status = :status OR status = :status OR status = :status)", array(':assigned_to_uid' => $user->uid, ':status' => ABUSE_PENDING, ':status' => ABUSE_HIDDEN, ':status' => ABUSE_SUPERADMIN))->fetchField();
   }
   return $result;
 }