Fix adding questionnaire problem