Added multiple filters.
Fixing some issues after the refactoring.