Improved the insertion of questions.