improved questionnaire checking