Bug fix

- On filter
- Default filtering (opened issues)