Refactoring
Integrate Solr with Rest error handling etc