Finalize solr improvements.