Select city refactoring