CRM-17422 fix - Change in custom field search behaviour impacting on performance