Including distribution search optimization for ES 0.9.5