Fix city selection