Merge fixes for question.xhtml