Finished solr integration - Pending code cleanup