Fixing handling of non-department organizations