New version of the questionnaire. Fix bugs on debug mode