Improving elastic search support.