Use DOM Xpath query instead of get element by id which was flakey