make search field changes more robust; some renaming