upgraded XPath evaluator