Remove references to people_group in report query