=== modified file 'includes/database.inc'
--- includes/database.inc	
+++ includes/database.inc	
@@ -255,7 +255,7 @@ function _db_rewrite_sql($query = '', $p
 }
 
 /**
- * Rewrites node queries.
+ * Rewrites node, taxonomy and comment queries. Use it for listing queries.
  *
  * @param $query
  *   Query to be rewritten.
@@ -278,7 +278,7 @@ function db_rewrite_sql($query, $primary
   }
 
   if (!empty($join)) {
-    $query = preg_replace('|FROM[^[:upper:]/,_]+|','\0 '. $join .' ', $query);
+    $query = preg_replace('/LEFT |RIGHT |INNER |WHERE|GROUP|ORDER|$/', $join .' \0', $query, 1);
   }
 
   if (!empty($where)) {