Updates to template handler and solr data handler