code changes for solr