ER-16 - fixed encounterLocation tag to use the uuid.