minor cleanup changes to search