Index: branches/RC/core/units/general/main_event_handler.php
===================================================================
diff -u -N -r10274 -r11501
--- branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 10274)
+++ branches/RC/core/units/general/main_event_handler.php	(.../main_event_handler.php)	(revision 11501)
@@ -87,9 +87,13 @@
 				$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
-				if (!preg_match('/Content\/'.preg_quote($t, '/').'/i', $category_filename)) {
-					$ret .= $category_filename.'/';
+
+				preg_match('/Content\/(.*)/i', $category_filename, $regs);
+				if ($regs && ($regs[1] != $t)) {
+					$ret .= ($t == '__default__' ? $regs[1] : $category_filename) . '/';
 				}
+
+//				$ret .= $this->Application->getFilename('c', $processed_params['m_cat_id']).'/';
 				$url_params['category_processed'] = true;
 			}
 			else {