Revert "Merge pull request #970 from dimagi/oopsie-daisies"

This reverts commit d010bd4cadb23e2963eab477a6fe30b7a1ba545b, reversing
changes made to 4662ed285f466e9f3675e17c87ac2b0b826aedc0.
undo undoing of yedi's changes to filter stuff...
Merge pull request #973 from dimagi/filters-again

Filter stuff with changes from yedi