Add type filter
Merge branch 'feature/filter'