Add switch-return statement in QuestionEditController And fix Add Option in CHooseFromList