Updated query construction to use elasticsearch_dsl