Make org type optional in iter_orgs