Updated facets and index field to use label for subject.