SDPII-32 Solr Refactor