Improve city database search