Added filter helper
Refactored to use filter helper