Index: trunk/core/kernel/event_handler.php
===================================================================
diff -u -N -r4137 -r4141
--- trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 4137)
+++ trunk/core/kernel/event_handler.php	(.../event_handler.php)	(revision 4141)
@@ -199,7 +199,7 @@
 				// if template is also item template of category, then remove template
 				$template = getArrayValue($url_params, 't');
 				$item_template = $this->Application->getCache('item_templates', $category_id);
-				if ($template == $item_template) {
+				if ($template == $item_template || strtolower($template) == '__default__') {
 					unset($url_params['t']);
 				}
 				
Index: trunk/core/units/general/main_event_handler.php
===================================================================
diff -u -N -r4135 -r4141
--- trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 4135)
+++ trunk/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 4141)
@@ -107,7 +107,7 @@
 			$category_template = $processed_params['m_cat_id'] ? $this->Application->getCache('category_templates', $processed_params['m_cat_id']) : '';
 			
 			// remove template from url if it is category index cached template
-			if ($template == $category_template) {
+			if ($template == $category_template || strtolower($template) == '__default__') {
 				$template = '';
 			}
 			
Index: trunk/kernel/units/general/main_event_handler.php
===================================================================
diff -u -N -r4135 -r4141
--- trunk/kernel/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 4135)
+++ trunk/kernel/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 4141)
@@ -107,7 +107,7 @@
 			$category_template = $processed_params['m_cat_id'] ? $this->Application->getCache('category_templates', $processed_params['m_cat_id']) : '';
 			
 			// remove template from url if it is category index cached template
-			if ($template == $category_template) {
+			if ($template == $category_template || strtolower($template) == '__default__') {
 				$template = '';
 			}
 			
Index: trunk/themes/default/categories/catlist_element.tpl
===================================================================
diff -u -N -r3174 -r4141
--- trunk/themes/default/categories/catlist_element.tpl	(.../catlist_element.tpl)	(revision 3174)
+++ trunk/themes/default/categories/catlist_element.tpl	(.../catlist_element.tpl)	(revision 4141)
@@ -4,7 +4,7 @@
    	<td valign="top">
    		<a href="<inp:cat _field="link" />"><img src="img/ic_category.gif" border=0 width="17" height="17" alt="" /></a><br /></td>
 		<td><img src="img/s.gif" width="5" height="1" alt="" /><br /></td>
-		<td class="item"><A href="<inp:cat _field="link" reset="1"/>"><inp:cat _Field="Name" /></a> <span class="comments">(<inp:m_language _Phrase="lu_subcats" /> <inp:cat _Field="subcatcount" _GroupOnly="1" />)</span>
+		<td class="item"><A href="<inp:cat _field="link" _Template="__default__" reset="1"/>"><inp:cat _Field="Name" /></a> <span class="comments">(<inp:m_language _Phrase="lu_subcats" /> <inp:cat _Field="subcatcount" _GroupOnly="1" />)</span>
     	<inp:cat _field="new"><img src="img/ic_new.gif" width="11" height="11" alt="<inp:m_language _Phrase="lu_new" />" /></inp>
       <inp:cat _field="pick"><img src="img/ic_pick.gif" width="11" height="11" alt="<inp:m_language _Phrase="lu_editors_pick" />" /></inp>
     </td>