Added support for dynamic grid filtering