EsInsight modified