Fixed Elastic Search setup