Added locationChoiceChosen = true when picking a location.