Change xpath for css selector where possible to make it faster