Index: branches/RC/core/units/general/cat_event_handler.php
===================================================================
diff -u -r9302 -r9363
--- branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 9302)
+++ branches/RC/core/units/general/cat_event_handler.php	(.../cat_event_handler.php)	(revision 9363)
@@ -934,7 +934,14 @@
 				// processing fields from local table
 				if ($search_config[$field]['CustomFieldId']) {
 					$local_table = 'custom_data';
-					$field_list[$key] = 'l'.$lang.'_cust_'.array_search($field_list[$key], $custom_fields);
+
+					// search by custom field value on current language
+					$custom_field_id = array_search($field_list[$key], $custom_fields);
+					$field_list[$key] = 'l'.$lang.'_cust_'.$custom_field_id;
+
+					// search by custom field value on primary language
+					$field_list[$key.'_primary'] = 'l'.$this->Application->GetDefaultLanguageId().'_cust_'.$custom_field_id;
+					$search_config_map[ $field_list[$key.'_primary'] ] = $field;
 				}
 				$field_list[$key] = $local_table.'.'.$field_list[$key];
 				$search_config_map[ $field_list[$key] ] = $field;