More compound solr work.