Solr -> ElastichSearch and minor fixes