elastic search fixes