expand the fixed-bucket-aggregation facet merge hack to work with no-zero-score query wrappig the clojure expression query