Index: branches/RC/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r11501 -r11504
--- branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11501)
+++ branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11504)
@@ -1016,13 +1016,13 @@
 
 		// different path in structure AND design template differes from requested template
 		$structure_path_match = strtolower( $page->GetDBField('NamedParentPath') ) == strtolower('Content/' . $template);
-		$design_match = $page->GetDBField('Template') == $template;
+		$design_match = $page->GetDBField('CachedTemplate') == $template;
 
 		if (!$structure_path_match && !$design_match) {
 			// Same sql like in "c:getPassedID". Load, when current page object doesn't match requested page object
 			$sql = 'SELECT ' . $page->IDField . '
 					FROM ' . $page->TableName . '
-					WHERE (NamedParentPath = ' . $this->Conn->qstr('Content/' . $template) . ') OR (IsSystem = 1 AND Template = ' . $this->Conn->qstr($template) . ')';
+					WHERE (NamedParentPath = ' . $this->Conn->qstr('Content/' . $template) . ') OR (IsSystem = 1 AND CachedTemplate = ' . $this->Conn->qstr($template) . ')';
 			$page_id = $this->Conn->GetOne($sql);
 
 			$page->Load($page_id);
@@ -1612,8 +1612,8 @@
 
 		$lang_part = '';
 		for ($i = 1; $i <= $languages_count; $i++) {
-			$lang_part .= 'c.l' . $i . '_Name AS l' . $i . '_ItemName,' . "\n";
-			// $lang_part .= 'p.l' . $i . '_MenuTitle AS l' . $i . '_ItemName,' . "\n";
+//			$lang_part .= 'c.l' . $i . '_Name AS l' . $i . '_ItemName,' . "\n";
+			$lang_part .= 'c.l' . $i . '_MenuTitle AS l' . $i . '_ItemName,' . "\n";
 		}
 
 		// Sub-categories from current category
@@ -1750,7 +1750,7 @@
 	 *
 	 * @param Array $params
 	 * @return string
-	 * @todo Needs to be replaced with "m:GetConfig" tag
+	 * @todo Needs to be replaced with "m:GetConfig" tag; Not used now (were used on structure_edit.tpl).
 	 */
 	function AllowManualFilenames($params)
 	{