subject facet top level + various changes