Index: branches/RC/core/units/general/main_event_handler.php
===================================================================
diff -u -r11501 -r11520
--- branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 11501)
+++ branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 11520)
@@ -86,14 +86,15 @@
 			if ($processed_params['m_cat_id'] > 0 && isset($url_params['pass_category']) && $url_params['pass_category']) {
 				$category_filename = $this->Application->getFilename('c', $processed_params['m_cat_id']);
 				$t = isset($url_params['t']) && $url_params['t'] ? $url_params['t'] : false;
-				// category name doesn't match template name -> Proj-CMS/In-Edit tricks
 
-				preg_match('/Content\/(.*)/i', $category_filename, $regs);
-				if ($regs && ($regs[1] != $t)) {
-					$ret .= ($t == '__default__' ? $regs[1] : $category_filename) . '/';
+				// we could have category path like "Content/<template_path>" in this case remove template (proj-cms trick)
+				preg_match('/^Content\/(.*)/i', $category_filename, $regs);
+				if ($regs && (strtolower($regs[1]) == strtolower($t))) {
+					$url_params['t'] = '';
 				}
 
-//				$ret .= $this->Application->getFilename('c', $processed_params['m_cat_id']).'/';
+				$ret .= $regs[1] . '/';
+
 				$url_params['category_processed'] = true;
 			}
 			else {