Index: branches/5.2.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r15727 -r16007
--- branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 15727)
+++ branches/5.2.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16007)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 15727 2013-04-10 18:04:16Z alex $
+* @version	$Id: dblist.php 16007 2014-02-06 10:52:49Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -182,23 +182,23 @@
 	/**
 	 * WHERE filter objects
 	 *
-	 * @var Array
+	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $WhereFilter = Array ();
 
 	/**
 	 * HAVING filter objects
 	 *
-	 * @var Array
+	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $HavingFilter = Array ();
 
 	/**
 	 * AGGREGATED filter objects
 	 *
-	 * @var Array
+	 * @var kMultipleFilter[]
 	 * @access protected
 	 */
 	protected $AggregateFilter = Array ();
@@ -698,7 +698,7 @@
 
 		if ( $for_counting ) {
 			$usage_string = $where . '|' . $having . '|' . $order . '|' . $group . '|' . $keep_clause;
-			$optimizer = new LeftJoinOptimizer($q, str_replace('%1$s', $this->TableName, $usage_string));
+			$optimizer = new LeftJoinOptimizer($q, $this->replaceModePrefix( str_replace('%1$s', $this->TableName, $usage_string) ));
 			$q = $optimizer->simplify();
 		}
 
@@ -746,7 +746,12 @@
 		$where = $this->Application->makeClass('kMultipleFilter');
 		/* @var $where kMultipleFilter */
 
-		$where->addFilter('system_where', $this->WhereFilter[self::FLT_SYSTEM] );
+		if ( $for_counting ) {
+			$where->addFilter('system_where', $this->extractCalculatedFields($this->WhereFilter[self::FLT_SYSTEM]->getSQL()) );
+		}
+		else {
+			$where->addFilter('system_where', $this->WhereFilter[self::FLT_SYSTEM] );
+		}
 
 		if (!$system_filters_only) {
 			$where->addFilter('view_where', $this->WhereFilter[self::FLT_VIEW] );