Fix filtering
Merge pull request #5 from rodms10/master

Fix filtering