Fix server sort