diff --git a/data/fields/royal_cypher.json b/data/fields/royal_cypher-GB.json
similarity index 83%
rename from data/fields/royal_cypher.json
rename to data/fields/royal_cypher-GB.json
index b546596fd..664397d94 100644
--- a/data/fields/royal_cypher.json
+++ b/data/fields/royal_cypher-GB.json
@@ -16,5 +16,10 @@
         }
     },
     "autoSuggestions": false,
-    "customValues": false
+    "customValues": false,
+    "locationSet": {
+        "include": [
+            "gb"
+        ]
+    }
 }
diff --git a/data/presets/amenity/post_box.json b/data/presets/amenity/post_box.json
index ca46a60da..a8445f2a6 100644
--- a/data/presets/amenity/post_box.json
+++ b/data/presets/amenity/post_box.json
@@ -3,7 +3,9 @@
     "fields": [
         "operator",
         "collection_times",
-        "ref"
+        "ref",
+        "post_box/type-GB",
+        "royal_cypher-GB"
     ],
     "moreFields": [
         "access_simple",
@@ -46,7 +48,6 @@
     ],
     "locationSet": {
         "exclude": [
-            "gb",
             "us"
         ]
     },
diff --git a/data/presets/amenity/post_box/post_box-GB.json b/data/presets/amenity/post_box/post_box-GB.json
deleted file mode 100644
index b276980d2..000000000
--- a/data/presets/amenity/post_box/post_box-GB.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "icon": "temaki-post_box",
-    "locationSet": {
-        "include": [
-            "gb"
-        ]
-    },
-    "fields": [
-        "{amenity/post_box}",
-        "post_box/type-GB",
-        "royal_cypher"
-    ],
-    "moreFields": [
-        "{amenity/post_box}",
-        "drive_through"
-    ],
-    "geometry": [
-        "point",
-        "vertex"
-    ],
-    "tags": {
-        "amenity": "post_box"
-    },
-    "name": "{amenity/post_box}"
-}