Made xpaths less brittle