organization based on endpoint instead of hostname