Fix group_id being renamed to just id