Slimming down all the solr service calls, to try and avoid another thread error