Many changes to indexing.

Removed the solr stuff - only ES left. Fixed bugs and cehcnged retrieval method.