Ashwin/Baba | #2582 | refactoring filters.