Worked on EER-25 to resolved multiple choice fileds issue