bring some of the changes into solr_pilot