Clean up filter behavior handling
Merge pull request #13 from thetristan/clean_up_filtering

Clean up filter behavior handling