Refactoring solr configuration approach. Streamlining.