Solr improvements