better support for multiple choice questions