Revert "Revert "Fixed the FilterItems class""

This reverts commit 0794743b8abe2e919f7d86cb59a2e34562ea67d7.
Revert "Revert "Revert "Fixed the FilterItems class"""

This reverts commit f52566b4eab141d86372f8a9ac6fe31b3f97205d.