Minor tweaks to schema for clearer facets.