XPathParser: updated regexps