Index: branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -r6118 -r6486
--- branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6118)
+++ branches/unlabeled/unlabeled-1.25.2/kernel/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6486)
@@ -345,7 +345,8 @@
 			$block_params = Array('name' => $params['render_as']);
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$prefix = $module_info['Var'];
-				if (in_array($prefix, $skip_prefixes)) continue;
+
+				if (in_array($prefix, $skip_prefixes) || !$this->Application->getUnitOption($prefix, 'CatalogItem')) continue;
 				if ($prefix == 'm' && $replace_main) $prefix = 'c';
 				$label = $this->Application->getUnitOption($prefix, $params['title_property']);
 				$block_params['title'] = $label;
Index: branches/unlabeled/unlabeled-1.25.2/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r6118 -r6486
--- branches/unlabeled/unlabeled-1.25.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6118)
+++ branches/unlabeled/unlabeled-1.25.2/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 6486)
@@ -345,7 +345,8 @@
 			$block_params = Array('name' => $params['render_as']);
 			foreach ($this->Application->ModuleInfo as $module_name => $module_info) {
 				$prefix = $module_info['Var'];
-				if (in_array($prefix, $skip_prefixes)) continue;
+
+				if (in_array($prefix, $skip_prefixes) || !$this->Application->getUnitOption($prefix, 'CatalogItem')) continue;
 				if ($prefix == 'm' && $replace_main) $prefix = 'c';
 				$label = $this->Application->getUnitOption($prefix, $params['title_property']);
 				$block_params['title'] = $label;
Index: branches/unlabeled/unlabeled-1.8.2/core/units/general/general_config.php
===================================================================
diff -u -r5552 -r6486
--- branches/unlabeled/unlabeled-1.8.2/core/units/general/general_config.php	(.../general_config.php)	(revision 5552)
+++ branches/unlabeled/unlabeled-1.8.2/core/units/general/general_config.php	(.../general_config.php)	(revision 6486)
@@ -15,8 +15,10 @@
 					'TitleField'		=>	'CachedNavbar',
 					'TitlePhrase'		=>	'la_Text_Category',
 					'ItemType'			=>	1,
-					'TableName'			=>	TABLE_PREFIX.'Category',					
-				
+					'TableName'			=>	TABLE_PREFIX.'Category',
+					
+					'CatalogItem'		=>	true,
+					
 					'PortalStyleEnv' => true,
 					
 					'PermTabText'		=>	'In-Portal',
Index: branches/unlabeled/unlabeled-1.8.2/kernel/units/general/general_config.php
===================================================================
diff -u -r5552 -r6486
--- branches/unlabeled/unlabeled-1.8.2/kernel/units/general/general_config.php	(.../general_config.php)	(revision 5552)
+++ branches/unlabeled/unlabeled-1.8.2/kernel/units/general/general_config.php	(.../general_config.php)	(revision 6486)
@@ -15,8 +15,10 @@
 					'TitleField'		=>	'CachedNavbar',
 					'TitlePhrase'		=>	'la_Text_Category',
 					'ItemType'			=>	1,
-					'TableName'			=>	TABLE_PREFIX.'Category',					
-				
+					'TableName'			=>	TABLE_PREFIX.'Category',
+					
+					'CatalogItem'		=>	true,
+					
 					'PortalStyleEnv' => true,
 					
 					'PermTabText'		=>	'In-Portal',