Enhancement/filter grid

| Q                    | A
| -------------------- | ---
| Bug fix?             | no
| New feature?         | no
| BC breaks?           | no
| Checkstyle issues?*  | yes
| PMD issues?**        | ?
| Changelog updated?   | no
| Fixed tickets        | #6