More work and testing with SOLR templates.