Fix filter
Add sample filter
Add test cases