use dict constructor instead of dict comprehension; support wrap a query in a constant score query

see http://www.elasticsearch.org/guide/reference/query-dsl/constant-score-query.html