improved filter
refactoring
0.10.1