solr refactoring