Restored completeness and orgunitgroupset for existing shortnames and codes