Refactored filter views