diff --git a/data/addons/br-nfse-v1.json b/data/addons/br-nfse-v1.json
index 7dca06f4..c74084ca 100644
--- a/data/addons/br-nfse-v1.json
+++ b/data/addons/br-nfse-v1.json
@@ -12,8 +12,9 @@
         "pt": "Código CNAE"
       },
       "desc": {
-        "en": "The CNAE (National Classification of Economic Activities) code for a service.\n\nFor further details on the list of possible codes, see:\n\n* https://www.ibge.gov.br/en/statistics/technical-documents/statistical-lists-and-classifications/17245-national-classification-of-economic-activities.html"
-      }
+        "en": "The CNAE (National Classification of Economic Activities) code for a service.\n\nList of codes from the IBGE (Brazilian Institute of Geography and Statistics):\n\n* https://www.ibge.gov.br/en/statistics/technical-documents/statistical-lists-and-classifications/17245-national-classification-of-economic-activities.html"
+      },
+      "pattern": "^\\d{2}[\\s\\.\\-\\/]?\\d{2}[\\s\\.\\-\\/]?\\d[\\s\\.\\-\\/]?\\d{2}$"
     },
     {
       "key": "br-nfse-fiscal-incentive",
@@ -22,7 +23,7 @@
         "pt": "Incentivo Fiscal"
       },
       "desc": {
-        "en": "Indicates whether a party benefits from a fiscal incentive.\n\nList of codes taken from the national NFSe standard:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-68)"
+        "en": "Indicates whether a party benefits from a fiscal incentive.\n\nList of codes from the national NFSe ABRASF (v2.04) model:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-68)"
       },
       "values": [
         {
@@ -48,7 +49,7 @@
         "pt": "Exigibilidade ISS"
       },
       "desc": {
-        "en": "Indicates the ISS liability status, i.e., whether the ISS tax is due or not and why.\n\nList of codes taken from the national NFSe standard:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-38)"
+        "en": "Indicates the ISS liability status, i.e., whether the ISS tax is due or not and why.\n\nList of codes from the national NFSe ABRASF (v2.04) model:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-38)"
       },
       "values": [
         {
@@ -109,7 +110,7 @@
         "pt": "Código do Município do IBGE"
       },
       "desc": {
-        "en": "The municipality code as defined by the IGBE (Brazilian Institute of Geography and\nStatistics).\n\nFor further details on the list of possible codes, see:\n\n* https://www.ibge.gov.br/explica/codigos-dos-municipios.php"
+        "en": "The municipality code as defined by the IGBE (Brazilian Institute of Geography and\nStatistics).\n\nList of codes from the IGBE:\n\n* https://www.ibge.gov.br/explica/codigos-dos-municipios.php"
       },
       "pattern": "^\\d{7}$"
     },
@@ -130,7 +131,7 @@
         "pt": "Optante pelo Simples Nacional"
       },
       "desc": {
-        "en": "Indicates whether a party is opting for the “Simples Nacional” tax regime.\n\nList of codes taken from the national NFSe standard:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-67)"
+        "en": "Indicates whether a party is opting for the “Simples Nacional” tax regime.\n\nList of codes from the national NFSe ABRASF (v2.04) model:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-67)"
       },
       "values": [
         {
@@ -156,7 +157,7 @@
         "pt": "Regime Especial de Tributação"
       },
       "desc": {
-        "en": "Indicates a special tax regime that the party is subject to.\n\nList of codes taken from the national NFSe standard:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-66)"
+        "en": "Indicates a special tax regime that a party is subject to.\n\nList of codes from the national NFSe ABRASF (v2.04) model:\n\n* https://abrasf.org.br/biblioteca/arquivos-publicos/nfs-e-manual-de-orientacao-do-contribuinte-2-04/download\n(Section 10.2, Field B-66)"
       },
       "values": [
         {