Fixed search regression after upgrading elasticutils (bug 870949)

This also moves a few "queries" to a "filter" since these shouldn't
affect scoring and as a filter they'll be cached by elasticsearch.