tp #1070 tp #1071, minor surveyView refactoring