Index: trunk/kernel/units/config_search/config_search_event_handler.php
===================================================================
diff -u -N -r4043 -r4052
--- trunk/kernel/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 4043)
+++ trunk/kernel/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 4052)
@@ -13,9 +13,13 @@
 		{
 			$object =& $event->getObject();
 			
+			// show only items that belong to selected module
 			$module_owner = $this->Application->GetLinkedVar('module');
 			$this->Application->LinkVar('section');
 			$object->addFilter('module_filter', '%1$s.ModuleName = '.$this->Conn->qstr($module_owner));
+			
+			// don't show disabled search items
+			$object->addFilter('active_filter', '%1$s.SimpleSearch <> -1');
 		}
 
 		/**
@@ -73,8 +77,6 @@
 			$cf_search['ConfigHeader']	=	$custom_field->GetDBField('Heading'); //  'la_Text_CustomFields';
 			$cf_search['TableName']		=	'CustomField';
 			$cf_search['ModuleName']	=	$module_name;
-			$cf_search['ForeignField']	=	'CustomMetaData.Value';
-			$cf_search['JoinClause']	=	'{ForeignTable}.ResourceId={LocalTable}.ResourceId';			
 			$object->SetFieldsFromHash($cf_search);
 			
 			$result = $object->isLoaded() ? $object->Update() : $object->Create();