More grouping adjustments, verify group headers are present