Fixed support for multiple choice questions