Fixed filters issue