Fix data grid sort issue