Fix streak counters by sorting beforehand