Fix QuestionGrid duplication