Fixes & tests
Merge pull request #4 from alfred82santa/feature/basic-filters

Fixes & tests