Optimize filters implementation in Grid
update filters implementation