more code changes for SOLR