fixing double orgs + possible NULLs