Improved XPath extractor
Improved XPath extractor