MDL-53728 question import/export: improve form structure