Fixed bugs relating to Matching question type