Question form: Moved questionnaire_id and parent_id from subform to main form