Index: branches/RC/core/units/config_search/config_search_event_handler.php
===================================================================
diff -u -r10838 -r11853
--- branches/RC/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 10838)
+++ branches/RC/core/units/config_search/config_search_event_handler.php	(.../config_search_event_handler.php)	(revision 11853)
@@ -80,19 +80,22 @@
 			$object =& $event->getObject( Array('skip_autoload' => true) );
 
 			$custom_id = $custom_field->GetID();
-			if ($object->GetDBField('CustomFieldId') != $custom_id) {
+			if (!$object->isLoaded() || ($object->GetDBField('CustomFieldId') != $custom_id)) {
 				$object->Load($custom_id, 'CustomFieldId');
 			}
 
 			$cf_search = Array();
-			$cf_search['DisplayOrder']	=	$custom_field->GetDBField('DisplayOrder');
-			$cf_search['FieldType']		=	$custom_field->GetDBField('ElementType');
-			$cf_search['DisplayName']	=	$custom_field->GetDBField('FieldLabel');
-			$cf_search['FieldName']		=	$custom_field->GetDBField('FieldName');
-			$cf_search['Description']	=	$custom_field->GetDBField('Prompt');
-			$cf_search['ConfigHeader']	=	$custom_field->GetDBField('Heading'); //  'la_Text_CustomFields';
-			$cf_search['TableName']		=	'CustomField';
+			$element_type = $custom_field->GetDBField('ElementType');
 
+			$cf_search['DisplayOrder'] = $custom_field->GetDBField('DisplayOrder');
+			$cf_search['FieldType'] = $element_type;
+			$cf_search['DisplayName'] = $custom_field->GetDBField('FieldLabel');
+			$cf_search['FieldName'] = $custom_field->GetDBField('FieldName');
+			$cf_search['Description'] = $custom_field->GetDBField('Prompt');
+			$cf_search['ConfigHeader'] = $custom_field->GetDBField('Heading'); //  'la_Text_CustomFields';
+			$cf_search['SimpleSearch'] = in_array($element_type, Array ('text', 'range', 'select', 'multiselect')) ? 1 : 0;
+			$cf_search['TableName'] = 'CustomField';
+
 			$sql = 'SELECT Module
 					FROM '.TABLE_PREFIX.'ItemTypes
 					WHERE ItemType = '.$custom_field->GetDBField('Type');