- refactor filtered city search