fixes
DEP-61 filters removed, some refactorisation