Fix xpath queries