- modified some xpath queries