Fix Grid sort