finishes refactoring, binds filters