Made hierarchy-based linking to containers depend on the setting and cleaned up SolrDefault.