Readded survey questions to class report