Fix some issues about questions and their order