added new fields
corrected xpath