Separete MCQ control from the view and other corrections