fixed some filter issues