linked Facility to locations.Location, updated vocabulary