Fix Bug 886887 - Server side Elastic Search DSL Generation