Switch over to using OfficialSurvey and OrganizationSurvey associations