Solr -> ElasticSearch and minor fixes