Changes to make ConfidentialPhraseCategory2* return Set