EDOC-853: changing xPath processing