refactor city select for new users