Clean up; Fix queries so pages can be used multiple times within the same survey, and did the same for questions in the same page