Get rid of double versioning of question in options for question