Fixed small issue with filtering