fixed more xpaths