- Revised XPath capturing