Fixed related to agencyID in property and concept/codelist in data