upgraded to handle solr4