Fix bug for token in XPathEngine
Finish stage 2