#21 servers sorting added