#516- Implementing new logic for SurveyPages.