added solr
minor code cosmetic changes