Elasticsearch indexation update and other fixes