Fix values for GoalSurvey choices