fixes to city selection