Enhancement

- Split filters
- Fix tests
- Some code clean up