Updated grid to ignore sort columns that don't exist in the actual grid
Merged