Work on orgs lookup for import