Trying to get filtering to work
Merged, accepted upstream code