refactor search for new locations