mainly solr stuff, simplifications