Address issue with filtering on non-reorderable grids

* Fixed an issue whereby non-reorderable grids could no longer be
filtered