XPath changed + stdef logic changed