ElasticSearch output layout fixes