refactoring accounts filters