Fix more grouping mistakes for region and server stats