Add filters from the querystring in a non-broken way
Merge pull request #625 from kennknowles/better-es-filter

Add filters from the querystring in a non-broken way