Fix for column sorting in grid