Add -count
Add -partition-by-header