Fix variables and domains from Questionnaire