Added multi filtering functionality. Changed tests. Refactored.