Redis output layout fixes
ElasticSearch output layout fixes