Tokenizer question order fix