Added ESQuery convertor