Made it a bit less error prone and start with a city selected.