Support multiple questions in new surveys