More work on elasticsearch output