More SOLR work