Update all ES queries to use Elasticsearch DSL (bug 1036168)

yeah, it got ugly when I tried to keep it.