Clean up search field names