fix id retrieval for organizations