Rename
Fix for handling no filter
Refactoring