Implement dynamic filters
Refactor dynamic filters