diff --git a/followthemoney/schema/Airplane.yaml b/followthemoney/schema/Airplane.yaml
index 8bddf4204..a38b11c5d 100644
--- a/followthemoney/schema/Airplane.yaml
+++ b/followthemoney/schema/Airplane.yaml
@@ -21,5 +21,7 @@ Airplane:
       type: identifier
     icaoCode: # A320
       label: ICAO aircraft type designator
+      type: identifier
+      maxLength: 16
     manufacturer: # Airbus
       label: Manufacturer
diff --git a/followthemoney/schema/Organization.yaml b/followthemoney/schema/Organization.yaml
index 9d0d17735..a4701717a 100644
--- a/followthemoney/schema/Organization.yaml
+++ b/followthemoney/schema/Organization.yaml
@@ -22,6 +22,7 @@ Organization:
       label: CAGE
       description: Commercial and Government Entity Code (CAGE)
       type: identifier
+      maxLength: 16
     permId:
       label: PermID
       description: LSEG/Refinitiv code for a company
diff --git a/followthemoney/schema/Sanction.yaml b/followthemoney/schema/Sanction.yaml
index abc35629f..22ecc0873 100644
--- a/followthemoney/schema/Sanction.yaml
+++ b/followthemoney/schema/Sanction.yaml
@@ -39,6 +39,7 @@ Sanction:
       # could also be used for authority-issued IDs in other usage scenarios.
       label: "Program ID"
       type: identifier
+      maxLength: 64
     programUrl:
       label: "Program URL"
       type: url
diff --git a/js/src/defaultModel.json b/js/src/defaultModel.json
index acb3eb409..83d321026 100644
--- a/js/src/defaultModel.json
+++ b/js/src/defaultModel.json
@@ -190,10 +190,11 @@
       "properties": {
         "icaoCode": {
           "label": "ICAO aircraft type designator",
-          "maxLength": 1024,
+          "matchable": true,
+          "maxLength": 16,
           "name": "icaoCode",
           "qname": "Airplane:icaoCode",
-          "type": "string"
+          "type": "identifier"
         },
         "manufacturer": {
           "label": "Manufacturer",
@@ -4362,7 +4363,7 @@
           "description": "Commercial and Government Entity Code (CAGE)",
           "label": "CAGE",
           "matchable": true,
-          "maxLength": 64,
+          "maxLength": 16,
           "name": "cageCode",
           "qname": "Organization:cageCode",
           "type": "identifier"