Index: branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php
===================================================================
diff -u -r6820 -r6853
--- branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php	(.../dblist.php)	(revision 6820)
+++ branches/unlabeled/unlabeled-1.21.4/core/kernel/db/dblist.php	(.../dblist.php)	(revision 6853)
@@ -415,7 +415,8 @@
 		$fields = $this->getCalculatedFields($aggregated);
 		if (is_array($fields) && count($fields) > 0) {
 			foreach ($fields as $field_name => $field_expression) {
-				$clause = preg_replace('/(([(]*)|[,` ]{1})'.$field_name.'[` ]{1}/', '$1 '.$field_expression.' ', $clause);
+				$clause = preg_replace('/(\\(+)[(,` ]*'.$field_name.'[` ]{1}/', '\1 '.$field_expression.' ', $clause);
+				$clause = preg_replace('/[,` ]{1}'.$field_name.'[` ]{1}/', ' '.$field_expression.' ', $clause);
 			}
 		}
 		return $clause;