Changing how the og_groups and og_groups_both are getting set.