31053014-3 - Fix the Grp & Org Cntrl

Group And Org handaling