286 switch from solr to elastic search

Should do the first fixes for the search with elasticsearch instead of solr
Please fix the indentation.