Fix filtering for 2.3.x
Merge pull request #14 from zimmen/master

Filter fix for 2.3.x