Fix weird Filter-behaivior - Version 2