[1284] First stage of fix so that we can test on prod2. Replaces group_show with organization_show