Improve get cities functionality