small grouping rule updates