Various changes to elasticsearch state