Fixed mapping of org groups to objects being created on import