Updated data_criteria id xpath