Changed key notation in xpath queries