diff --git a/custom-words.txt b/custom-words.txt
index 5fcb47c34cc5..ee93513ec76a 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -2061,3 +2061,9 @@ tpgs
 ProviderHub
 checkin
 regionality
+BRCPF
+IDRG
+EUGPS
+PLREGON
+ESDNI
+USUK
diff --git a/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.1-preview.4/TextAnalytics.json b/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.1-preview.4/TextAnalytics.json
index 6d1d51acb4ca..05675dc41dd2 100644
--- a/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.1-preview.4/TextAnalytics.json
+++ b/specification/cognitiveservices/data-plane/TextAnalytics/preview/v3.1-preview.4/TextAnalytics.json
@@ -867,7 +867,7 @@
               "type": "string"
             },
             "piiCategories": {
-              "$ref": "#/parameters/PiiCategories"
+              "$ref": "#/definitions/PiiCategories"
             },
             "stringIndexType": {
               "$ref": "#/definitions/StringIndexType"
@@ -2330,6 +2330,193 @@
         ]
       },
       "type": "string"
+    },
+    "PiiCategories": {
+      "description": "(Optional) describes the PII categories to return",
+      "items": {
+        "type": "string",
+        "x-ms-enum": {
+          "name": "PiiCategory",
+          "modelAsString": true
+        },
+        "enum": [
+          "ABARoutingNumber",
+          "ARNationalIdentityNumber",
+          "AUBankAccountNumber",
+          "AUDriversLicenseNumber",
+          "AUMedicalAccountNumber",
+          "AUPassportNumber",
+          "AUTaxFileNumber",
+          "AUBusinessNumber",
+          "AUCompanyNumber",
+          "ATIdentityCard",
+          "ATTaxIdentificationNumber",
+          "ATValueAddedTaxNumber",
+          "AzureDocumentDBAuthKey",
+          "AzureIAASDatabaseConnectionAndSQLString",
+          "AzureIoTConnectionString",
+          "AzurePublishSettingPassword",
+          "AzureRedisCacheString",
+          "AzureSAS",
+          "AzureServiceBusString",
+          "AzureStorageAccountKey",
+          "AzureStorageAccountGeneric",
+          "BENationalNumber",
+          "BENationalNumberV2",
+          "BEValueAddedTaxNumber",
+          "BRCPFNumber",
+          "BRLegalEntityNumber",
+          "BRNationalIDRG",
+          "BGUniformCivilNumber",
+          "CABankAccountNumber",
+          "CADriversLicenseNumber",
+          "CAHealthServiceNumber",
+          "CAPassportNumber",
+          "CAPersonalHealthIdentification",
+          "CASocialInsuranceNumber",
+          "CLIdentityCardNumber",
+          "CNResidentIdentityCardNumber",
+          "CreditCardNumber",
+          "HRIdentityCardNumber",
+          "HRNationalIDNumber",
+          "HRPersonalIdentificationNumber",
+          "HRPersonalIdentificationOIBNumberV2",
+          "CYIdentityCard",
+          "CYTaxIdentificationNumber",
+          "CZPersonalIdentityNumber",
+          "CZPersonalIdentityV2",
+          "DKPersonalIdentificationNumber",
+          "DKPersonalIdentificationV2",
+          "DrugEnforcementAgencyNumber",
+          "EEPersonalIdentificationCode",
+          "EUDebitCardNumber",
+          "EUDriversLicenseNumber",
+          "EUGPSCoordinates",
+          "EUNationalIdentificationNumber",
+          "EUPassportNumber",
+          "EUSocialSecurityNumber",
+          "EUTaxIdentificationNumber",
+          "FIEuropeanHealthNumber",
+          "FINationalID",
+          "FINationalIDV2",
+          "FIPassportNumber",
+          "FRDriversLicenseNumber",
+          "FRHealthInsuranceNumber",
+          "FRNationalID",
+          "FRPassportNumber",
+          "FRSocialSecurityNumber",
+          "FRTaxIdentificationNumber",
+          "FRValueAddedTaxNumber",
+          "DEDriversLicenseNumber",
+          "DEPassportNumber",
+          "DEIdentityCardNumber",
+          "DETaxIdentificationNumber",
+          "DEValueAddedNumber",
+          "GRNationalIDCard",
+          "GRNationalIDV2",
+          "GRTaxIdentificationNumber",
+          "HKIdentityCardNumber",
+          "HUValueAddedNumber",
+          "HUPersonalIdentificationNumber",
+          "HUTaxIdentificationNumber",
+          "INPermanentAccount",
+          "INUniqueIdentificationNumber",
+          "IDIdentityCardNumber",
+          "InternationalBankingAccountNumber",
+          "IEPersonalPublicServiceNumber",
+          "IEPersonalPublicServiceNumberV2",
+          "ILBankAccountNumber",
+          "ILNationalID",
+          "ITDriversLicenseNumber",
+          "ITFiscalCode",
+          "ITValueAddedTaxNumber",
+          "JPBankAccountNumber",
+          "JPDriversLicenseNumber",
+          "JPPassportNumber",
+          "JPResidentRegistrationNumber",
+          "JPSocialInsuranceNumber",
+          "JPMyNumberCorporate",
+          "JPMyNumberPersonal",
+          "JPResidenceCardNumber",
+          "LVPersonalCode",
+          "LTPersonalCode",
+          "LUNationalIdentificationNumberNatural",
+          "LUNationalIdentificationNumberNonNatural",
+          "MYIdentityCardNumber",
+          "MTIdentityCardNumber",
+          "MTTaxIDNumber",
+          "NLCitizensServiceNumber",
+          "NLCitizensServiceNumberV2",
+          "NLTaxIdentificationNumber",
+          "NLValueAddedTaxNumber",
+          "NZBankAccountNumber",
+          "NZDriversLicenseNumber",
+          "NZInlandRevenueNumber",
+          "NZMinistryOfHealthNumber",
+          "NZSocialWelfareNumber",
+          "NOIdentityNumber",
+          "PHUnifiedMultiPurposeIDNumber",
+          "PLIdentityCard",
+          "PLNationalID",
+          "PLNationalIDV2",
+          "PLPassportNumber",
+          "PLTaxIdentificationNumber",
+          "PLREGONNumber",
+          "PTCitizenCardNumber",
+          "PTCitizenCardNumberV2",
+          "PTTaxIdentificationNumber",
+          "ROPersonalNumericalCode",
+          "RUPassportNumberDomestic",
+          "RUPassportNumberInternational",
+          "SANationalID",
+          "SGNationalRegistrationIdentityCardNumber",
+          "SKPersonalNumber",
+          "SITaxIdentificationNumber",
+          "SIUniqueMasterCitizenNumber",
+          "ZAIdentificationNumber",
+          "KRResidentRegistrationNumber",
+          "ESDNI",
+          "ESSocialSecurityNumber",
+          "ESTaxIdentificationNumber",
+          "SQLServerConnectionString",
+          "SENationalID",
+          "SENationalIDV2",
+          "SEPassportNumber",
+          "SETaxIdentificationNumber",
+          "SWIFTCode",
+          "CHSocialSecurityNumber",
+          "TWNationalID",
+          "TWPassportNumber",
+          "TWResidentCertificate",
+          "THPopulationIdentificationCode",
+          "TRNationalIdentificationNumber",
+          "UKDriversLicenseNumber",
+          "UKElectoralRollNumber",
+          "UKNationalHealthNumber",
+          "UKNationalInsuranceNumber",
+          "UKUniqueTaxpayerNumber",
+          "USUKPassportNumber",
+          "USBankAccountNumber",
+          "USDriversLicenseNumber",
+          "USIndividualTaxpayerIdentification",
+          "USSocialSecurityNumber",
+          "UAPassportNumberDomestic",
+          "UAPassportNumberInternational",
+          "Organization",
+          "Email",
+          "URL",
+          "Age",
+          "PhoneNumber",
+          "IPAddress",
+          "Date",
+          "Person",
+          "Address",
+          "All",
+          "Default"
+        ]
+      },
+      "type": "array",
+      "uniqueItems": true
     }
   },
   "parameters": {
@@ -2376,16 +2563,190 @@
     "PiiCategories": {
       "description": "(Optional) describes the PII categories to return",
       "in": "query",
+      "collectionFormat": "csv",
       "items": {
         "type": "string",
         "x-ms-enum": {
           "name": "PiiCategory",
           "modelAsString": true
         },
-        "enum": ["ABARoutingNumber", "ARNationalIdentityNumber", "AUBankAccountNumber", "AUDriversLicenseNumber", "AUMedicalAccountNumber", "AUPassportNumber", "AUTaxFileNumber", "AUBusinessNumber", "AUCompanyNumber", "ATIdentityCard", "ATTaxIdentificationNumber", "ATValueAddedTaxNumber", "AzureDocumentDBAuthKey", "AzureIAASDatabaseConnectionandSQLString", "AzureIoTConnectionString", "AzurePublishSettingPassword", "AzureRedisCacheString", "AzureSAS", "AzureServiceBusString", "AzureStorageAccountKey", "AzureStorageAccountGeneric", "BENationalNumber", "BENationalNumberV2", "BEValueAddedTaxNumber", "BRCPFNumber", "BRLegalEntityNumber", "BRNationalIDRG", "BGUniformCivilNumber", "CABankAccountNumber", "CADriversLicenseNumber", "CAHealthServiceNumber", "CAPassportNumber", "CAPersonalHealthIdentification", "CASocialInsuranceNumber", "CLIdentityCardNumber", "CNResidentIdentityCardNumber", "CreditCardNumber", "HRIdentityCardNumber", "HRNationalIDNumber", "HRPersonalIdentificationNumber", "HRPersonalIdentificationOIBNumberV2", "CYIdentityCard", "CYTaxIdentificationNumber", "CZPersonalIdentityNumber", "CZPersonalIdentityV2", "DKPersonalIdentificationNumber", "DKPersonalIdentificationV2", "DrugEnforcementAgencyNumber", "EEPersonalIdentificationCode", "EUDebitCardNumber", "EUDriversLicenseNumber", "EUGPSCoordinates", "EUNationalIdentificationNumber", "EUPassportNumber", "EUSocialSecurityNumber", "EUTaxIdentificationNumber", "FIEuropeanHealthNumber", "FINationalID", "FINationalIDV2", "FIPassportNumber", "FRDriversLicenseNumber", "FRHealthInsuranceNumber", "FRNationalID", "FRPassportNumber", "FRSocialSecurityNumber", "FRTaxIdentificationNumber", "FRValueAddedTaxNumber", "DEDriversLicenseNumber", "DEPassportNumber", "DEIdentityCardNumber", "DETaxIdentificationNumber", "DEValueAddedNumber", "GRNationalIDCard", "GRNationalIDV2", "GRTaxIdentificationNumber", "HKIdentityCardNumber", "HUValueAddedNumber", "HUPersonalIdentificationNumber", "HUTaxIdentificationNumber", "INPermanentAccount", "INUniqueIdentificationNumber", "IDIdentityCardNumber", "InternationlBankingAccountNumber", "IEPersonalPublicServiceNumber", "IEPersonalPublicServiceNumberV2", "ILBankAccountNumber", "ILNationalID", "ITDriversLicenseNumber", "ITFiscalCode", "ITValueAddedTaxNumber", "JPBankAccountNumber", "JPDriversLicenseNumber", "JPPassportNumber", "JPResidentRegistrationNumber", "JPSocialInsuranceNumber", "JPMyNumberCorporate", "JPMyNumberPersonal", "JPResidenceCardNumber", "LVPersonalCode", "LTPersonalCode", "LUNationalIdentificationNumberNatural", "LUNationalIdentificationNumberNonNatural", "MYIdentityCardNumber", "MAIdentityCardNumber", "MTTaxIDNumber", "NLCitizensServiceNumber", "NLCitizensServiceNumberV2", "NLTaxIdentificationNumber", "NLValueAddedTaxNumber", "NZBankAccountNumber", "NZDriversLicenseNumber", "NZInlandRevenueNumber", "NZMinistryOfHealthNumber", "NZSocialWelfareNumber", "NOIdentityNumber", "PHUnifiedMultiPurposeIDNumber", "PLIdentityCard", "PLNationalID", "PLNationalIDV2", "PLPassportNumber", "PLTaxIdentificationNumber", "PLREGONNumber", "PTCitizenCardNumber", "PTCitizenCardNumberV2", "PTTaxIdentificationNumber", "ROPersonalNumericalCode", "RUPassportNumberDomestic", "RUPassportNumberInternational", "SANationalID", "SGNationalRegistrationIdentityCardNumber", "SKPersonalNumber", "SITaxIdentificationNumber", "SIUniqueMasterCitizenNumber", "ZAIdentificationNumber", "KRResidentRegistrationNumber", "ESDNI", "ESSocialSecurityNumber", "ESTaxIdentificationNumber", "SQLServerConnectionString", "SENationalID", "SENationalIDV2", "SEPassportNumber", "SETaxIdentificationNumber", "SWIFTCode", "CHSocialSecurityNumber", "TWNationalID", "TWPassportNumber", "TWResidentCertificate", "THPopulationIdentificationCode", "TRNationalIdentificationnumber", "UKDriversLicenseNumber", "UKElectoralRollNumber", "UKNationalHealthNumber", "UKNationalInsuranceNumber", "UKUniqueTaxpayerNumber", "USUKPassportNumber", "USBankAccountNumber", "USDriversLicenseNumber", "USIndividualTaxpayerIdentification", "USSocialSecurityNumber", "UAPassportNumberDomestic", "UAPassportNumberInternational", "Organization", "Email", "URL", "Age", "PhoneNumber", "IPAddress", "Date", "Person", "Address", "All", "Default"]
+        "enum": [
+          "ABARoutingNumber",
+          "ARNationalIdentityNumber",
+          "AUBankAccountNumber",
+          "AUDriversLicenseNumber",
+          "AUMedicalAccountNumber",
+          "AUPassportNumber",
+          "AUTaxFileNumber",
+          "AUBusinessNumber",
+          "AUCompanyNumber",
+          "ATIdentityCard",
+          "ATTaxIdentificationNumber",
+          "ATValueAddedTaxNumber",
+          "AzureDocumentDBAuthKey",
+          "AzureIAASDatabaseConnectionAndSQLString",
+          "AzureIoTConnectionString",
+          "AzurePublishSettingPassword",
+          "AzureRedisCacheString",
+          "AzureSAS",
+          "AzureServiceBusString",
+          "AzureStorageAccountKey",
+          "AzureStorageAccountGeneric",
+          "BENationalNumber",
+          "BENationalNumberV2",
+          "BEValueAddedTaxNumber",
+          "BRCPFNumber",
+          "BRLegalEntityNumber",
+          "BRNationalIDRG",
+          "BGUniformCivilNumber",
+          "CABankAccountNumber",
+          "CADriversLicenseNumber",
+          "CAHealthServiceNumber",
+          "CAPassportNumber",
+          "CAPersonalHealthIdentification",
+          "CASocialInsuranceNumber",
+          "CLIdentityCardNumber",
+          "CNResidentIdentityCardNumber",
+          "CreditCardNumber",
+          "HRIdentityCardNumber",
+          "HRNationalIDNumber",
+          "HRPersonalIdentificationNumber",
+          "HRPersonalIdentificationOIBNumberV2",
+          "CYIdentityCard",
+          "CYTaxIdentificationNumber",
+          "CZPersonalIdentityNumber",
+          "CZPersonalIdentityV2",
+          "DKPersonalIdentificationNumber",
+          "DKPersonalIdentificationV2",
+          "DrugEnforcementAgencyNumber",
+          "EEPersonalIdentificationCode",
+          "EUDebitCardNumber",
+          "EUDriversLicenseNumber",
+          "EUGPSCoordinates",
+          "EUNationalIdentificationNumber",
+          "EUPassportNumber",
+          "EUSocialSecurityNumber",
+          "EUTaxIdentificationNumber",
+          "FIEuropeanHealthNumber",
+          "FINationalID",
+          "FINationalIDV2",
+          "FIPassportNumber",
+          "FRDriversLicenseNumber",
+          "FRHealthInsuranceNumber",
+          "FRNationalID",
+          "FRPassportNumber",
+          "FRSocialSecurityNumber",
+          "FRTaxIdentificationNumber",
+          "FRValueAddedTaxNumber",
+          "DEDriversLicenseNumber",
+          "DEPassportNumber",
+          "DEIdentityCardNumber",
+          "DETaxIdentificationNumber",
+          "DEValueAddedNumber",
+          "GRNationalIDCard",
+          "GRNationalIDV2",
+          "GRTaxIdentificationNumber",
+          "HKIdentityCardNumber",
+          "HUValueAddedNumber",
+          "HUPersonalIdentificationNumber",
+          "HUTaxIdentificationNumber",
+          "INPermanentAccount",
+          "INUniqueIdentificationNumber",
+          "IDIdentityCardNumber",
+          "InternationalBankingAccountNumber",
+          "IEPersonalPublicServiceNumber",
+          "IEPersonalPublicServiceNumberV2",
+          "ILBankAccountNumber",
+          "ILNationalID",
+          "ITDriversLicenseNumber",
+          "ITFiscalCode",
+          "ITValueAddedTaxNumber",
+          "JPBankAccountNumber",
+          "JPDriversLicenseNumber",
+          "JPPassportNumber",
+          "JPResidentRegistrationNumber",
+          "JPSocialInsuranceNumber",
+          "JPMyNumberCorporate",
+          "JPMyNumberPersonal",
+          "JPResidenceCardNumber",
+          "LVPersonalCode",
+          "LTPersonalCode",
+          "LUNationalIdentificationNumberNatural",
+          "LUNationalIdentificationNumberNonNatural",
+          "MYIdentityCardNumber",
+          "MTIdentityCardNumber",
+          "MTTaxIDNumber",
+          "NLCitizensServiceNumber",
+          "NLCitizensServiceNumberV2",
+          "NLTaxIdentificationNumber",
+          "NLValueAddedTaxNumber",
+          "NZBankAccountNumber",
+          "NZDriversLicenseNumber",
+          "NZInlandRevenueNumber",
+          "NZMinistryOfHealthNumber",
+          "NZSocialWelfareNumber",
+          "NOIdentityNumber",
+          "PHUnifiedMultiPurposeIDNumber",
+          "PLIdentityCard",
+          "PLNationalID",
+          "PLNationalIDV2",
+          "PLPassportNumber",
+          "PLTaxIdentificationNumber",
+          "PLREGONNumber",
+          "PTCitizenCardNumber",
+          "PTCitizenCardNumberV2",
+          "PTTaxIdentificationNumber",
+          "ROPersonalNumericalCode",
+          "RUPassportNumberDomestic",
+          "RUPassportNumberInternational",
+          "SANationalID",
+          "SGNationalRegistrationIdentityCardNumber",
+          "SKPersonalNumber",
+          "SITaxIdentificationNumber",
+          "SIUniqueMasterCitizenNumber",
+          "ZAIdentificationNumber",
+          "KRResidentRegistrationNumber",
+          "ESDNI",
+          "ESSocialSecurityNumber",
+          "ESTaxIdentificationNumber",
+          "SQLServerConnectionString",
+          "SENationalID",
+          "SENationalIDV2",
+          "SEPassportNumber",
+          "SETaxIdentificationNumber",
+          "SWIFTCode",
+          "CHSocialSecurityNumber",
+          "TWNationalID",
+          "TWPassportNumber",
+          "TWResidentCertificate",
+          "THPopulationIdentificationCode",
+          "TRNationalIdentificationNumber",
+          "UKDriversLicenseNumber",
+          "UKElectoralRollNumber",
+          "UKNationalHealthNumber",
+          "UKNationalInsuranceNumber",
+          "UKUniqueTaxpayerNumber",
+          "USUKPassportNumber",
+          "USBankAccountNumber",
+          "USDriversLicenseNumber",
+          "USIndividualTaxpayerIdentification",
+          "USSocialSecurityNumber",
+          "UAPassportNumberDomestic",
+          "UAPassportNumberInternational",
+          "Organization",
+          "Email",
+          "URL",
+          "Age",
+          "PhoneNumber",
+          "IPAddress",
+          "Date",
+          "Person",
+          "Address",
+          "All",
+          "Default"
+        ]
       },
       "name": "piiCategories",
-      "default": "Default",
       "required": false,
       "type": "array",
       "uniqueItems": true,