Index: branches/5.3.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r16226 -r16395
--- branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16226)
+++ branches/5.3.x/core/kernel/db/dblist.php	(.../dblist.php)	(revision 16395)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: dblist.php 16226 2015-09-01 08:21:44Z alex $
+* @version	$Id: dblist.php 16395 2016-11-12 12:43:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -724,6 +724,8 @@
 		$fields = $this->getCalculatedFields($aggregated);
 
 		if ( is_array($fields) && count($fields) > 0 ) {
+			$fields = str_replace('%2$s', $this->Application->GetVar('m_lang'), $fields);
+
 			foreach ($fields as $field_name => $field_expression) {
 				$clause = preg_replace('/(\\(+)[(,` ]*' . $field_name . '[` ]{1}/', '\1 (' . $field_expression . ') ', $clause);
 				$clause = preg_replace('/[,` ]{1}' . $field_name . '[` ]{1}/', ' (' . $field_expression . ') ', $clause);
@@ -746,12 +748,10 @@
 		$where = $this->Application->makeClass('kMultipleFilter');
 		/* @var $where kMultipleFilter */
 
-		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] );
-		}
+		$where->addFilter(
+			'system_where',
+			$this->extractCalculatedFields($this->WhereFilter[self::FLT_SYSTEM]->getSQL())
+		);
 
 		if (!$system_filters_only) {
 			$where->addFilter('view_where', $this->WhereFilter[self::FLT_VIEW] );