Add ability to search on city name and function