Revert "Merge pull request #1 from thecamper/advanced-filters"

This reverts commit d81d5ab1cd3a5a5c0021502e4f7a5375e0543997, reversing
changes made to f31c69d58d7e99926ceeb4bdbad120b05475e5b6.
Small revert changes

Need to go through and work with thecamper's code. I like some stuff
but need to pick and choose.