Force facet values to Unicode NFC to reduce spurious non-matches