Refactoring code. New filters system