correct solr url; clean up code