fixed references to id that should be group_id