revertion of design change in QuestionQuery