#114 Filter Refactoring