Solr factory improvements