Don't we want to only apply this to PolicyAdvisoryGroups? I think PolicyTeam should stay as it was.