Fixing filters issue