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

if you remove all the `else:`, you can remove the other `return value`s