updated org_location_type function