Better xpath matching