some minor changes
Our custom add-ons for Solr