Index: trunk/core/kernel/processors/tag_processor.php
===================================================================
diff -u -N -r1560 -r2348
--- trunk/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 1560)
+++ trunk/core/kernel/processors/tag_processor.php	(.../tag_processor.php)	(revision 2348)
@@ -65,7 +65,7 @@
 						$__tag_processor = $tmp['prefix'].'_TagProcessor';
 						$processor =& $this->Application->recallObject($__tag_processor);
 						$processor->Prefix = $tmp['prefix'];
-						$processor->Special = $tmp['special'];
+						$processor->Special = getArrayValue($tag_mapping, 2) ? $tag_mapping[2] : $tmp['special'];
 						$params['PrefixSpecial'] = $prefix;
 						return $processor->ProcessParsedTag($tag_mapping[1], $params, $prefix);
 					}
Index: trunk/core/kernel/db/dblist.php
===================================================================
diff -u -N -r1560 -r2348
--- trunk/core/kernel/db/dblist.php	(.../dblist.php)	(revision 1560)
+++ trunk/core/kernel/db/dblist.php	(.../dblist.php)	(revision 2348)
@@ -252,16 +252,16 @@
 	{
 		$all_sql = $this->GetSelectSQL(true,false);
 		$sql = $this->getCountSQL($all_sql);
-    $this->RecordsCount = (int)$this->Conn->GetOne($sql);
-    	
-    $system_sql = $this->GetSelectSQL(true,true);
-    if ($system_sql == $all_sql) { //no need to query the same again
-    	$this->NoFilterCount = $this->RecordsCount;
-    	return;
-    }
+	    $this->RecordsCount = (int)$this->Conn->GetOne($sql);
+	    	
+	    $system_sql = $this->GetSelectSQL(true,true);
+	    if ($system_sql == $all_sql) { //no need to query the same again
+	    	$this->NoFilterCount = $this->RecordsCount;
+	    	return;
+	    }
 		$sql = $this->getCountSQL($system_sql);
-    $this->NoFilterCount = (int)$this->Conn->GetOne($sql);
-    $this->Counted = true;
+	    $this->NoFilterCount = (int)$this->Conn->GetOne($sql);
+	    $this->Counted = true;
 	}
 	
 	function getCountSQL($sql)
Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r2334 -r2348
--- trunk/core/kernel/application.php	(.../application.php)	(revision 2334)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 2348)
@@ -998,7 +998,7 @@
 	function registerAggregateTag($tag_info)
 	{
 		$aggregator =& $this->recallObject('TagsAggregator', 'kArray');
-		$aggregator->SetArrayValue($tag_info['AggregateTo'], $tag_info['AggregatedTagName'], Array($tag_info['LocalPrefix'], $tag_info['LocalTagName']));
+		$aggregator->SetArrayValue($tag_info['AggregateTo'], $tag_info['AggregatedTagName'], Array($tag_info['LocalPrefix'], $tag_info['LocalTagName'], getArrayValue($tag_info, 'LocalSpecial')));
 	}
 	
 	/**
Index: trunk/themes/default/my_account.tpl
===================================================================
diff -u -N -r1984 -r2348
--- trunk/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 1984)
+++ trunk/themes/default/my_account.tpl	(.../my_account.tpl)	(revision 2348)
@@ -218,8 +218,14 @@
 											<td colspan="4"><img src="img/s.gif" width="1" height="10" alt="" /><br /></td>
 										</tr>
 										<tr>
-                      <inp:perm_include _Module="In-Bulletin" _Template="inbulletin/my_account/topics.tpl" />
+											<inp:perm_include _Module="In-Commerce" _Template="in-commerce/blocks/my_account/my_downloads_link.tpl" />
 										</tr>
+										<tr>
+											<td colspan="4"><img src="img/s.gif" width="1" height="10" alt="" /><br /></td>
+										</tr>
+										<tr>
+											<inp:perm_include _Module="In-Bulletin" _Template="inbulletin/my_account/topics.tpl" />
+										</tr>
 									</table><br /><br />
 									<!-- end profile content -->
 								</td>
Index: trunk/core/kernel/utility/params.php
===================================================================
diff -u -N -r1801 -r2348
--- trunk/core/kernel/utility/params.php	(.../params.php)	(revision 1801)
+++ trunk/core/kernel/utility/params.php	(.../params.php)	(revision 2348)
@@ -114,7 +114,7 @@
 	 */
 	function GetArrayValue()
 	{
-		$args = func_get_args(); 
+		$args = func_get_args();
 		array_unshift_ref($args, $this->_Array);
 		return call_user_func_array('getArrayValue', $args);
 	}
Index: trunk/core/kernel/utility/formatters.php
===================================================================
diff -u -N -r2336 -r2348
--- trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2336)
+++ trunk/core/kernel/utility/formatters.php	(.../formatters.php)	(revision 2348)
@@ -601,8 +601,8 @@
 						{
 							$object->SetDBField($options['orig_name_field'], $value['name']);
 						}
-						$ret = getArrayValue($options, 'upload_path') ? $real_name : $this->DestinationPath.$real_name;
-					}					
+						$ret = getArrayValue($options, 'upload_dir') ? $real_name : $this->DestinationPath.$real_name;
+					}
 				}
 			}
 			else
@@ -622,8 +622,8 @@
 	function ValidateFileName($path, $name)
 	{
 		$parts = pathinfo($name);
-	  $ext = '.'.$parts['extension'];
-	  $filename = substr($parts['basename'], 0, -strlen($ext));
+		$ext = '.'.$parts['extension'];
+		$filename = substr($parts['basename'], 0, -strlen($ext));
 		$new_name = $filename.$ext;
 		while ( file_exists($path.'/'.$new_name) ) 
 		{