* xpath grammar update