Improved handling of question index.