Fixed and improved handling of mandatory questions.