GroupByServerIdFix