[feature] Adding filter
[minor] Small refactoring
[minor] Small refactoring