CRM-12940, unique-names with prefix for search fields, removed not required code.