Improved solr resolver.