Removed underscores from JSON key names.

6 years ago · 794315720d
parent 7aa523310a
commit 794315720d
57 changed files with 2668 additions and 2144 deletions
--- a/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "3PP", "\u2020" ],
  "note_number": "6\u2020",
  "notes": [ "A", "B", "D" ],
-  "_id_": "be/o:000",
-  "_gpid_": 2173
+  "id": "be/o:000",
+  "gpid": 2173
 },
 { "name": "M76 A",
  "type": "MTR",
@ -14,8 +14,8 @@
  "capabilities2": { "LF": [ ["INF"], "\u2020" ] },
  "note_number": "7\u2020",
  "notes": [ "A", "B", "D" ],
-  "_id_": "be/o:001",
-  "_gpid_": 2211
+  "id": "be/o:001",
+  "gpid": 2211
 },
 { "name": "M76 A",
  "type": "INF",
@ -23,8 +23,8 @@
  "capabilities2": { "LF": [ ["INF"], "\u2020" ] },
  "note_number": "7\u2020",
  "notes": [ "A", "B", "D" ],
-  "_id_": "be/o:002",
-  "_gpid_": 2212
+  "id": "be/o:002",
+  "gpid": 2212
 },
 { "name": "7.6cm FRC",
  "type": "INF",
@ -32,16 +32,16 @@
  "capabilities_other": [ "\u2020" ],
  "note_number": "8\u2020",
  "notes": [ "A", "B" ],
-  "_id_": "be/o:003",
-  "_gpid_": 2212
+  "id": "be/o:003",
+  "gpid": 2212
 },
 { "name": "C47 FRC M 32",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "9",
  "notes": [ "B" ],
-  "_id_": "be/o:004",
-  "_gpid_": 2213
+  "id": "be/o:004",
+  "gpid": 2213
 },
 { "name": "C75 TR",
  "type": "ART",
@ -49,8 +49,8 @@
  "capabilities2": { "s": 5 },
  "note_number": "10",
  "notes": [ "B" ],
-  "_id_": "be/o:005",
-  "_gpid_": 2214
+  "id": "be/o:005",
+  "gpid": 2214
 },
 { "name": "C75 GP",
  "type": "ART",
@ -58,8 +58,8 @@
  "capabilities2": { "LF": [ "75*", "B10" ], "s": 5 },
  "note_number": "11",
  "notes": [ "B" ],
-  "_id_": "be/o:006",
-  "_gpid_": 2215
+  "id": "be/o:006",
+  "gpid": 2215
 },
 { "name": "Ob 105 GP",
  "type": "ART",
@ -67,8 +67,8 @@
  "capabilities2": { "LF": [ "105*" ], "s": 5 },
  "note_number": "12",
  "notes": [ "B" ],
-  "_id_": "be/o:007",
-  "_gpid_": 2216
+  "id": "be/o:007",
+  "gpid": 2216
 },
 { "name": "C120 M31",
  "type": "ART",
@ -76,8 +76,8 @@
  "capabilities2": { "LF": [ "120*" ] },
  "note_number": "13",
  "notes": [ "B" ],
-  "_id_": "be/o:008",
-  "_gpid_": 2217
+  "id": "be/o:008",
+  "gpid": 2217
 },
 { "name": "M27 FRC",
  "type": "AA",
@ -85,8 +85,8 @@
  "capabilities_other": [ "ST" ],
  "note_number": "14",
  "notes": [ "B" ],
-  "_id_": "be/o:009",
-  "_gpid_": 2218
+  "id": "be/o:009",
+  "gpid": 2218
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/common.json
@ -6,40 +6,40 @@
  "capabilities2": { "s": 8 },
  "note_number": "23\u2020",
  "notes": [ "A", "B", "Gr", "N", "P", "Y" ],
-  "_id_": "alc/o:000",
-  "_gpid_": 2193
+  "id": "alc/o:000",
+  "gpid": 2193
 },
 { "name": "37mm Bofors AT",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "24\u2020",
  "notes": [ "A", "De", "P" ],
-  "_id_": "alc/o:001",
-  "_gpid_": 2195
+  "id": "alc/o:001",
+  "gpid": 2195
 },
 { "name": "3.7cm PaK 35/36",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "25\u2020",
  "notes": [ "Gr", "Ne", "Y" ],
-  "_id_": "alc/o:002",
-  "_gpid_": 2196
+  "id": "alc/o:002",
+  "gpid": 2196
 },
 { "name": "Bohler M35 47mm",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "26\u2020",
  "notes": [ "A", "Gr", "Ne", "Y" ],
-  "_id_": "alc/o:003",
-  "_gpid_": 2197
+  "id": "alc/o:003",
+  "gpid": 2197
 },
 { "name": "65mm wz.06",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
  "note_number": "27\u2020",
  "notes": [ "A", "Gr", "P", "Y" ],
-  "_id_": "alc/o:004",
-  "_gpid_": 2198
+  "id": "alc/o:004",
+  "gpid": 2198
 },
 { "name": "75mm wz.97",
  "type": "ART",
@ -47,16 +47,16 @@
  "capabilities2": { "s": 8 },
  "note_number": "28\u2020",
  "notes": [ "A", "Gr", "N", "P" ],
-  "_id_": "alc/o:005",
-  "_gpid_": 2199
+  "id": "alc/o:005",
+  "gpid": 2199
 },
 { "name": "Bofors M34",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "29\u2020",
  "notes": [ "A", "B", "Gr", "Ne", "N" ],
-  "_id_": "alc/o:006",
-  "_gpid_": 2200
+  "id": "alc/o:006",
+  "gpid": 2200
 },
 { "name": "75M 19S",
  "type": "ART",
@ -64,16 +64,16 @@
  "capabilities2": { "s": 6, "AP": 5 },
  "note_number": "30\u2020",
  "notes": [ "A", "Gr", "P", "Y" ],
-  "_id_": "alc/o:007",
-  "_gpid_": 2201
+  "id": "alc/o:007",
+  "gpid": 2201
 },
 { "name": "C105 L 13 S",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "31\u2020",
  "notes": [ "B", "P", "Y" ],
-  "_id_": "alc/o:008",
-  "_gpid_": 2202
+  "id": "alc/o:008",
+  "gpid": 2202
 },
 { "name": "120mm wz. 09/31",
  "type": "ART",
@ -81,8 +81,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "32\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "alc/o:009",
-  "_gpid_": 2203
+  "id": "alc/o:009",
+  "gpid": 2203
 },
 { "name": "155mm 17 S",
  "type": "ART",
@ -90,16 +90,16 @@
  "capabilities2": { "s": 8 },
  "note_number": "33",
  "notes": [ "B", "Gr", "P", "Y" ],
-  "_id_": "alc/o:010",
-  "_gpid_": 2204
+  "id": "alc/o:010",
+  "gpid": 2204
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
  "type": "AA",
  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
  "note_number": "34\u2020",
  "notes": [ "T\u2020<sup>1</sup>", "B", "Gr", "Y" ],
-  "_id_": "alc/o:011",
-  "_gpid_": 2205
+  "id": "alc/o:011",
+  "gpid": 2205
 },
 { "name": "20mm Oerlikon",
  "type": "AA",
@ -107,8 +107,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF", "B11" ] },
  "note_number": "35\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "Gr", "Ne", "Y" ],
-  "_id_": "alc/o:012",
-  "_gpid_": 2206
+  "id": "alc/o:012",
+  "gpid": 2206
 },
 { "name": "40mm Bofors AA",
  "type": "AA",
@ -116,8 +116,8 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "36\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "B", "N", "Ne", "P" ],
-  "_id_": "alc/o:013",
-  "_gpid_": 2207
+  "id": "alc/o:013",
+  "gpid": 2207
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/danish.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/danish.json
@ -5,8 +5,8 @@
  "capabilities": [ "NT", "QSU\u2020<sup>1</sup>", "R2", "IFE=B10" ],
  "note_number": "19\u2020",
  "notes": [ "De", "T\u2020<sup>1</sup>" ],
-  "_id_": "da/o:000",
-  "_gpid_": 2222
+  "id": "da/o:000",
+  "gpid": 2222
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/dutch.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/dutch.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "5PP" ],
  "note_number": "15",
  "notes": [ "A", "Ne" ],
-  "_id_": "du/o:000",
-  "_gpid_": 2179
+  "id": "du/o:000",
+  "gpid": 2179
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/greek.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/greek.json
@ -6,24 +6,24 @@
  "capabilities2": { "s": 5 },
  "note_number": "16",
  "notes": [ "Gr" ],
-  "_id_": "gr/o:000",
-  "_gpid_": 2219
+  "id": "gr/o:000",
+  "gpid": 2219
 },
 { "name": "OR 105/19",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "note_number": "17",
  "notes": [ "Gr" ],
-  "_id_": "gr/o:001",
-  "_gpid_": 2220
+  "id": "gr/o:001",
+  "gpid": 2220
 },
 { "name": "3.7cm Bofors AA",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "18",
  "notes": [ "Gr" ],
-  "_id_": "gr/o:002",
-  "_gpid_": 2221
+  "id": "gr/o:002",
+  "gpid": 2221
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/polish.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/polish.json
@ -5,16 +5,16 @@
  "capabilities_other": [ "4PP" ],
  "note_number": "1",
  "notes": [ "A", "P" ],
-  "_id_": "po/o:000",
-  "_gpid_": 2172
+  "id": "po/o:000",
+  "gpid": 2172
 },
 { "name": "Ur. wz. 35",
  "type": "ATR",
  "capabilities_other": [ "1PP" ],
  "note_number": "2",
  "notes": [ "P" ],
-  "_id_": "po/o:001",
-  "_gpid_": 2176
+  "id": "po/o:001",
+  "gpid": 2176
 },
 { "name": "75mm wz. 02/26",
  "type": "ART",
@ -22,24 +22,24 @@
  "capabilities2": { "s": 6 },
  "note_number": "3",
  "notes": [ "P" ],
-  "_id_": "po/o:002",
-  "_gpid_": 2208
+  "id": "po/o:002",
+  "gpid": 2208
 },
 { "name": "100mm wz. 14/19",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "4",
  "notes": [ "A", "P" ],
-  "_id_": "po/o:003",
-  "_gpid_": 2209
+  "id": "po/o:003",
+  "gpid": 2209
 },
 { "name": "75mm wz. 97/25",
  "type": "AA",
  "capabilities": [ "T", "NM" ],
  "note_number": "5\u2020",
  "notes": [ "P" ],
-  "_id_": "po/o:004",
-  "_gpid_": 2210
+  "id": "po/o:004",
+  "gpid": 2210
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/allied-minor/yugoslavian.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/yugoslavian.json
@ -5,8 +5,8 @@
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "20",
  "notes": [ "Y" ],
-  "_id_": "yu/o:000",
-  "_gpid_": 2223
+  "id": "yu/o:000",
+  "gpid": 2223
 },
 { "name": "80mm M28/M33",
  "type": "ART",
@ -14,16 +14,16 @@
  "capabilities2": { "s": 5 },
  "note_number": "21",
  "notes": [ "Y" ],
-  "_id_": "yu/o:001",
-  "_gpid_": 2224
+  "id": "yu/o:001",
+  "gpid": 2224
 },
 { "name": "100mm M14/19",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "22",
  "notes": [ "Y" ],
-  "_id_": "yu/o:002",
-  "_gpid_": 2225
+  "id": "yu/o:002",
+  "gpid": 2225
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/american.json
+++ b/vasl_templates/webapp/data/ordnance/american.json
@ -7,8 +7,8 @@
  "capabilities_other": [ "5PP", "OBA\u2020" ],
  "note_number": "1\u2020",
  "notes": [ "F", "N" ],
-  "_id_": "am/o:000",
-  "_gpid_": 849
+  "id": "am/o:000",
+  "gpid": 849
 },
 { "name": "M19 60mm Mortar",
  "type": "MTR",
@ -17,8 +17,8 @@
  "capabilities_other": [ "4PP" ],
  "note_number": "2",
  "notes": [ "F" ],
-  "_id_": "am/o:001",
-  "_gpid_": 850
+  "id": "am/o:001",
+  "gpid": 850
 },
 { "name": "M1 81mm Mortar",
  "type": "MTR",
@ -26,16 +26,16 @@
  "capabilities2": { "WP": 8 },
  "note_number": "3",
  "notes": [ "F", "N" ],
-  "_id_": "am/o:002",
-  "_gpid_": 879
+  "id": "am/o:002",
+  "gpid": 879
 },
 { "name": "M2 4.2-in. Mortar",
  "type": "MTR",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "WP": 10 },
  "note_number": "4\u2020",
-  "_id_": "am/o:003",
-  "_gpid_": 881
+  "id": "am/o:003",
+  "gpid": 881
 },
 { "name": "T25 155mm Mortar",
  "type": "MTR",
@ -43,8 +43,8 @@
  "capabilities2": { "WP": 8 },
  "note_number": "5\u2020",
  "notes": [ "P" ],
-  "_id_": "am/o:004",
-  "_gpid_": 882
+  "id": "am/o:004",
+  "gpid": 882
 },
 { "name": "M3A1 37mm AT Gun",
  "type": "AT",
@ -52,16 +52,16 @@
  "capabilities2": { "C": [ [7,"A2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "6\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/o:005",
-  "_gpid_": 884
+  "id": "am/o:005",
+  "gpid": 884
 },
 { "name": "M1 57mm AT Gun",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "HE": [ [7,"J4E"], [7,5], "\u2020" ], "D": [ [4,"J4+E"], "\u2020" ] },
  "note_number": "7\u2020",
-  "_id_": "am/o:006",
-  "_gpid_": 885
+  "id": "am/o:006",
+  "gpid": 885
 },
 { "name": "M5 3-in. AT Gun",
  "type": "AT",
@ -69,16 +69,16 @@
  "capabilities2": { "A": [ [4,4], [5,5], "\u2020" ], "s": [ [6,5] ] },
  "note_number": "8\u2020",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/o:007",
-  "_gpid_": 886
+  "id": "am/o:007",
+  "gpid": 886
 },
 { "name": "T32 37mm Manpack Gun",
  "type": "INF",
  "capabilities": [ "5PP (3PP dm)\u2020", "C5\u2020<sup>1</sup>", "crewed\u2020<sup>2</sup>" ],
  "note_number": "9\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "D\u2020<sup>2</sup>", "F" ],
-  "_id_": "am/o:008",
-  "_gpid_": null
+  "id": "am/o:008",
+  "gpid": null
 },
 { "name": "M18 57mm Recoilless Rifle",
  "type": "RCL",
@ -86,8 +86,8 @@
  "capabilities2": { "H": 7, "WP": 6 },
  "note_number": "10",
  "notes": [ "D\u2020<sup>1</sup>", "E\u2020" ],
-  "_id_": "am/o:009",
-  "_gpid_": null
+  "id": "am/o:009",
+  "gpid": null
 },
 { "name": "M20 75mm Recoilless Rifle",
  "type": "RCL",
@ -95,8 +95,8 @@
  "capabilities2": { "H": 7, "WP": 7 },
  "note_number": "11",
  "notes": [ "D\u2020<sup>1</sup>", "E\u2020" ],
-  "_id_": "am/o:010",
-  "_gpid_": null
+  "id": "am/o:010",
+  "gpid": null
 },
 { "name": "M1A1 75mm Pack Howitzer",
  "type": "ART",
@ -104,8 +104,8 @@
  "capabilities2": { "H": 7, "WP": 8, "C": [ [4,"4+"], "\u2020<sup>1</sup>" ] },
  "note_number": "12\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "F" ],
-  "_id_": "am/o:011",
-  "_gpid_": 888
+  "id": "am/o:011",
+  "gpid": 888
 },
 { "name": "M1897A2 75mm Gun",
  "type": "ART",
@ -113,8 +113,8 @@
  "capabilities2": { "WP": 8 },
  "note_number": "13",
  "notes": [ "P" ],
-  "_id_": "am/o:012",
-  "_gpid_": 890
+  "id": "am/o:012",
+  "gpid": 890
 },
 { "name": "M2A1 105mm Howitzer",
  "type": "ART",
@ -122,8 +122,8 @@
  "capabilities2": { "H": 6, "s": 7, "WP": 8, "C": [ [7,"4+P"], "\u2020<sup>1</sup>" ] },
  "note_number": "14\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/o:013",
-  "_gpid_": 891
+  "id": "am/o:013",
+  "gpid": 891
 },
 { "name": "M3 105mm Howitzer",
  "type": "ART",
@ -131,16 +131,16 @@
  "capabilities2": { "H": 7, "s": 7, "WP": 8, "C": [ [7,"P"], "\u2020<sup>1</sup>" ] },
  "note_number": "15\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "am/o:014",
-  "_gpid_": 892
+  "id": "am/o:014",
+  "gpid": 892
 },
 { "name": "M1 4.5-in. Gun",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "16\u2020",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/o:015",
-  "_gpid_": 893
+  "id": "am/o:015",
+  "gpid": 893
 },
 { "name": "M1918 155mm Howitzer",
  "type": "ART",
@ -148,8 +148,8 @@
  "capabilities2": { "s": [ [7,"3+"] ], "WP": 8 },
  "note_number": "17\u2020",
  "notes": [ "N" ],
-  "_id_": "am/o:016",
-  "_gpid_": 894
+  "id": "am/o:016",
+  "gpid": 894
 },
 { "name": "M1 155mm Howitzer",
  "type": "ART",
@ -157,8 +157,8 @@
  "capabilities2": { "s": 7, "WP": 8 },
  "note_number": "18\u2020",
  "notes": [ "N" ],
-  "_id_": "am/o:017",
-  "_gpid_": 895
+  "id": "am/o:017",
+  "gpid": 895
 },
 { "name": "M1918M1 155mm Gun",
  "type": "ART",
@ -166,8 +166,8 @@
  "capabilities2": { "WP": 8 },
  "note_number": "19\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/o:018",
-  "_gpid_": 896
+  "id": "am/o:018",
+  "gpid": 896
 },
 { "name": "M1A1 155mm Gun",
  "type": "ART",
@ -175,15 +175,15 @@
  "capabilities2": { "s": [ [7,5] ], "WP": 8 },
  "note_number": "20\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "am/o:019",
-  "_gpid_": 897
+  "id": "am/o:019",
+  "gpid": 897
 },
 { "name": "M1 8-in. Howitzer",
  "type": "ART",
  "capabilities": [ "NT", "RFNM", "no IF" ],
  "note_number": "21\u2020",
-  "_id_": "am/o:020",
-  "_gpid_": 898
+  "id": "am/o:020",
+  "gpid": 898
 },
 { "name": "M51 Multiple .50-cal MG Carriage",
  "type": "AA",
@ -191,16 +191,16 @@
  "capabilities2": { "LF": [ "2 ROF", "20 IFE", "B11" ] },
  "capabilities_other": [ "4 TK DR\u2020" ],
  "note_number": "22\u2020",
-  "_id_": "am/o:021",
-  "_gpid_": 900
+  "id": "am/o:021",
+  "gpid": 900
 },
 { "name": "M1A2 37mm AA Gun",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "23\u2020",
  "notes": [ "N" ],
-  "_id_": "am/o:022",
-  "_gpid_": 901
+  "id": "am/o:022",
+  "gpid": 901
 },
 { "name": "M1 40mm AA Gun",
  "type": "AA",
@ -208,24 +208,24 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "24\u2020",
  "notes": [ "B\u2020<sup>1</sup>" ],
-  "_id_": "am/o:023",
-  "_gpid_": 902
+  "id": "am/o:023",
+  "gpid": 902
 },
 { "name": "M3 3-in. AA Gun",
  "type": "AA",
  "capabilities": [ "T", "NM" ],
  "note_number": "25",
  "notes": [ "P" ],
-  "_id_": "am/o:024",
-  "_gpid_": 903
+  "id": "am/o:024",
+  "gpid": 903
 },
 { "name": "M1A1 90mm AA Gun",
  "type": "AA",
  "capabilities": [ "T", "NM" ],
  "note_number": "26\u2020",
  "notes": [ "N" ],
-  "_id_": "am/o:025",
-  "_gpid_": 904
+  "id": "am/o:025",
+  "gpid": 904
 },
 { "name": "M2 90mm AA Gun",
  "type": "AA",
@ -233,8 +233,8 @@
  "capabilities2": { "LF": [ "90\u2020", "1 ROF", "B11" ] },
  "note_number": "27\u2020<sup>1</sup>",
  "notes": [ "B\u2020" ],
-  "_id_": "am/o:026",
-  "_gpid_": 905
+  "id": "am/o:026",
+  "gpid": 905
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "2PP" ],
  "note_number": "37",
  "notes": [ "A" ],
-  "_id_": "bu/o:000",
-  "_gpid_": 3679
+  "id": "bu/o:000",
+  "gpid": 3679
 },
 { "name": "Madsen M-35",
  "type": "AT",
@ -14,38 +14,38 @@
  "capabilities_other": [ "R2", "IFE=B10\u2020" ],
  "note_number": "38\u2020",
  "notes": [ "T\u2020<sup>1</sup>" ],
-  "_id_": "bu/o:001",
-  "_gpid_": 3775
+  "id": "bu/o:001",
+  "gpid": 3775
 },
 { "name": "Skoda Infantry Gun",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "39\u2020",
-  "_id_": "bu/o:002",
-  "_gpid_": 3776
+  "id": "bu/o:002",
+  "gpid": 3776
 },
 { "name": "Skoda Infantry Gun",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "39\u2020",
-  "_id_": "bu/o:003",
-  "_gpid_": 3777
+  "id": "bu/o:003",
+  "gpid": 3777
 },
 { "name": "Bofors 75mm M36",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "40\u2020",
  "notes": [ "A" ],
-  "_id_": "bu/o:004",
-  "_gpid_": 3778
+  "id": "bu/o:004",
+  "gpid": 3778
 },
 { "name": "75mm K-S",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "s": 5 },
  "note_number": "41\u2020",
-  "_id_": "bu/o:005",
-  "_gpid_": 3779
+  "id": "bu/o:005",
+  "gpid": 3779
 },
 { "name": "Ob 105mm GP",
  "type": "ART",
@ -53,15 +53,15 @@
  "capabilities2": { "s": 5, "LF": [ "105*\u2020<sup>1</sup>" ] },
  "note_number": "42\u2020",
  "notes": [ "G\u2020<sup>1</sup>" ],
-  "_id_": "bu/o:006",
-  "_gpid_": 3780
+  "id": "bu/o:006",
+  "gpid": 3780
 },
 { "name": "D/30 Krupp",
  "type": "ART",
  "capabilities": [ "NT", "RFNM", "no IF" ],
  "note_number": "43",
-  "_id_": "bu/o:007",
-  "_gpid_": 3781
+  "id": "bu/o:007",
+  "gpid": 3781
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
@ -5,16 +5,16 @@
  "capabilities_other": [ "5PP" ],
  "note_number": "44",
  "notes": [ "A", "H", "S", "C", "B" ],
-  "_id_": "axc/o:000",
-  "_gpid_": 3680
+  "id": "axc/o:000",
+  "gpid": 3680
 },
 { "name": "50mm RM obr. 40",
  "type": "MTR",
  "capabilities_other": [ "4PP" ],
  "note_number": "45",
  "notes": [ "A", "R", "H", "S", "C" ],
-  "_id_": "axc/o:001",
-  "_gpid_": 3681
+  "id": "axc/o:001",
+  "gpid": 3681
 },
 { "name": "8cm GrW 34",
  "type": "MTR",
@ -22,8 +22,8 @@
  "capabilities2": { "s": 7 },
  "note_number": "46\u2020",
  "notes": [ "A", "C", "B" ],
-  "_id_": "axc/o:002",
-  "_gpid_": 3709
+  "id": "axc/o:002",
+  "gpid": 3709
 },
 { "name": "Brandt M27/31",
  "type": "MTR",
@ -31,8 +31,8 @@
  "capabilities2": { "s": 7 },
  "note_number": "47\u2020",
  "notes": [ "A", "R", "H", "S" ],
-  "_id_": "axc/o:003",
-  "_gpid_": 3711
+  "id": "axc/o:003",
+  "gpid": 3711
 },
 { "name": "PM obr. 38",
  "type": "MTR",
@ -40,24 +40,24 @@
  "capabilities2": { "s": 8 },
  "note_number": "48\u2020",
  "notes": [ "R", "H" ],
-  "_id_": "axc/o:004",
-  "_gpid_": 3713
+  "id": "axc/o:004",
+  "gpid": 3713
 },
 { "name": "Ur wz. 35",
  "type": "ATR",
  "capabilities_other": [ "1PP" ],
  "note_number": "49",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/o:005",
-  "_gpid_": null
+  "id": "axc/o:005",
+  "gpid": null
 },
 { "name": "s18-1100",
  "type": "ATR",
  "capabilities_other": [ "5PP" ],
  "note_number": "50",
  "notes": [ "A", "R", "H" ],
-  "_id_": "axc/o:006",
-  "_gpid_": null
+  "id": "axc/o:006",
+  "gpid": null
 },
 { "name": "Kanon PUV vz. 37(t)",
  "type": "AT",
@ -65,16 +65,16 @@
  "capabilities2": { "A": [ [4,"1S"] ] },
  "note_number": "51\u2020",
  "notes": [ "E", "H", "S", "B" ],
-  "_id_": "axc/o:007",
-  "_gpid_": 3714
+  "id": "axc/o:007",
+  "gpid": 3714
 },
 { "name": "Bohler M35",
  "type": "AT",
  "capabilities": [ "NT", "QSU", "no Gunshield" ],
  "note_number": "52\u2020",
  "notes": [ "A", "R", "H", "S" ],
-  "_id_": "axc/o:008",
-  "_gpid_": 3715
+  "id": "axc/o:008",
+  "gpid": 3715
 },
 { "name": "5cm PaK 38(g)",
  "type": "AT",
@ -82,8 +82,8 @@
  "capabilities2": { "A": [ [4,3], [3,4] ] },
  "note_number": "53\u2020",
  "notes": [ "E", "R", "H", "S", "B" ],
-  "_id_": "axc/o:009",
-  "_gpid_": 3716
+  "id": "axc/o:009",
+  "gpid": 3716
 },
 { "name": "7.5cm PaK 97/38(g)",
  "type": "AT",
@ -91,8 +91,8 @@
  "capabilities2": { "H": [ [5,"3+"] ], "s": 6 },
  "note_number": "54\u2020",
  "notes": [ "E", "R", "B" ],
-  "_id_": "axc/o:010",
-  "_gpid_": 3717
+  "id": "axc/o:010",
+  "gpid": 3717
 },
 { "name": "7.5cm PaK 40(g)",
  "type": "AT",
@ -100,16 +100,16 @@
  "capabilities2": { "A": [ [4,3], [3,4] ] },
  "note_number": "55\u2020",
  "notes": [ "E", "R", "H", "S", "B" ],
-  "_id_": "axc/o:011",
-  "_gpid_": 3718
+  "id": "axc/o:011",
+  "gpid": 3718
 },
 { "name": "Skoda M15",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "56\u2020",
  "notes": [ "A", "R", "H", "S", "C", "B" ],
-  "_id_": "axc/o:012",
-  "_gpid_": 3719
+  "id": "axc/o:012",
+  "gpid": 3719
 },
 { "name": "Canon de 75 mle 1897",
  "type": "ART",
@ -117,8 +117,8 @@
  "capabilities2": { "s": 7 },
  "note_number": "57",
  "notes": [ "R", "B" ],
-  "_id_": "axc/o:013",
-  "_gpid_": 3720
+  "id": "axc/o:013",
+  "gpid": 3720
 },
 { "name": "Skoda M29",
  "type": "ART",
@ -126,24 +126,24 @@
  "capabilities2": { "AP": 6 },
  "note_number": "58\u2020",
  "notes": [ "A", "R", "S" ],
-  "_id_": "axc/o:014",
-  "_gpid_": 3721
+  "id": "axc/o:014",
+  "gpid": 3721
 },
 { "name": "Skoda M17",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "59\u2020",
  "notes": [ "A", "R", "S", "C" ],
-  "_id_": "axc/o:015",
-  "_gpid_": 3722
+  "id": "axc/o:015",
+  "gpid": 3722
 },
 { "name": "Skoda M28(80)",
  "type": "ART",
  "capabilities": [ "T" ],
  "note_number": "60\u2020",
  "notes": [ "S", "C" ],
-  "_id_": "axc/o:016",
-  "_gpid_": 3723
+  "id": "axc/o:016",
+  "gpid": 3723
 },
 { "name": "Skoda M14/19",
  "type": "ART",
@ -151,8 +151,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "61\u2020",
  "notes": [ "A\u2020", "R", "H", "S", "C" ],
-  "_id_": "axc/o:017",
-  "_gpid_": 3724
+  "id": "axc/o:017",
+  "gpid": 3724
 },
 { "name": "leFH 18(g)",
  "type": "ART",
@ -160,8 +160,8 @@
  "capabilities2": { "H": [ [4,"3+"] ], "s": 5 },
  "note_number": "62\u2020",
  "notes": [ "E", "H", "S", "B" ],
-  "_id_": "axc/o:018",
-  "_gpid_": 3725
+  "id": "axc/o:018",
+  "gpid": 3725
 },
 { "name": "Skoda M35",
  "type": "ART",
@ -169,8 +169,8 @@
  "capabilities2": { "AP": 7, "C": [ [7,"CS"], "\u2020" ] },
  "note_number": "63\u2020",
  "notes": [ "R", "S", "C" ],
-  "_id_": "axc/o:019",
-  "_gpid_": 3726
+  "id": "axc/o:019",
+  "gpid": 3726
 },
 { "name": "G obr. 10/30",
  "type": "ART",
@ -178,8 +178,8 @@
  "capabilities2": { "s": 7 },
  "note_number": "64\u2020",
  "notes": [ "R", "B" ],
-  "_id_": "axc/o:020",
-  "_gpid_": 3727
+  "id": "axc/o:020",
+  "gpid": 3727
 },
 { "name": "G obr. 38",
  "type": "ART",
@ -187,16 +187,16 @@
  "capabilities2": { "s": [ [5,"1-2R"], "\u2020" ] },
  "note_number": "65",
  "notes": [ "R", "B" ],
-  "_id_": "axc/o:021",
-  "_gpid_": 3728
+  "id": "axc/o:021",
+  "gpid": 3728
 },
 { "name": "Skoda M14",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "66\u2020",
  "notes": [ "R", "H", "S" ],
-  "_id_": "axc/o:022",
-  "_gpid_": 3729
+  "id": "axc/o:022",
+  "gpid": 3729
 },
 { "name": "Skoda M15/16",
  "type": "ART",
@ -204,8 +204,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "67\u2020",
  "notes": [ "S", "C" ],
-  "_id_": "axc/o:023",
-  "_gpid_": 3730
+  "id": "axc/o:023",
+  "gpid": 3730
 },
 { "name": "C mle 17 S",
  "type": "ART",
@ -213,8 +213,8 @@
  "capabilities2": { "s": 7 },
  "note_number": "68\u2020",
  "notes": [ "R", "B" ],
-  "_id_": "axc/o:024",
-  "_gpid_": 3731
+  "id": "axc/o:024",
+  "gpid": 3731
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
  "type": "AA",
@ -222,8 +222,8 @@
  "capabilities_other": [ "2 TK DR\u2020" ],
  "note_number": "69\u2020",
  "notes": [ "T\u2020<sup>1</sup>", "R", "B" ],
-  "_id_": "axc/o:025",
-  "_gpid_": 3732
+  "id": "axc/o:025",
+  "gpid": 3732
 },
 { "name": "Oerlikon FF",
  "type": "AA",
@ -231,8 +231,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B11" ] },
  "note_number": "70",
  "notes": [ "G\u2020", "R", "H", "S", "C", "B" ],
-  "_id_": "axc/o:026",
-  "_gpid_": 3733
+  "id": "axc/o:026",
+  "gpid": 3733
 },
 { "name": "2cm FlaK 30(g)",
  "type": "AA",
@ -240,8 +240,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF", "B9" ] },
  "note_number": "71\u2020",
  "notes": [ "E", "G\u2020<sup>1</sup>", "R", "B" ],
-  "_id_": "axc/o:027",
-  "_gpid_": 3734
+  "id": "axc/o:027",
+  "gpid": 3734
 },
 { "name": "2cm FlaK 38(g)",
  "type": "AA",
@ -249,16 +249,16 @@
  "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF", "B10" ] },
  "note_number": "72\u2020",
  "notes": [ "E", "G\u2020<sup>1</sup>", "R", "B" ],
-  "_id_": "axc/o:028",
-  "_gpid_": 3735
+  "id": "axc/o:028",
+  "gpid": 3735
 },
 { "name": "3.7cm FlaK 36(g)",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "73\u2020",
  "notes": [ "E", "R", "B" ],
-  "_id_": "axc/o:029",
-  "_gpid_": 3736
+  "id": "axc/o:029",
+  "gpid": 3736
 },
 { "name": "Bofors 40mm",
  "type": "AA",
@ -266,16 +266,16 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "74\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "R", "H", "S", "C" ],
-  "_id_": "axc/o:030",
-  "_gpid_": 3737
+  "id": "axc/o:030",
+  "gpid": 3737
 },
 { "name": "Skoda M33",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "75R",
  "notes": [ "S" ],
-  "_id_": "axc/o:031",
-  "_gpid_": 3738
+  "id": "axc/o:031",
+  "gpid": 3738
 },
 { "name": "8.8cm FlaK 18 o. 36(g)",
  "type": "AA",
@ -283,8 +283,8 @@
  "capabilities2": { "LF": [ "88\u2020<sup>1</sup>", "1 ROF", "B11" ] },
  "note_number": "76\u2020",
  "notes": [ "E", "G\u2020<sup>1</sup>", "R", "S", "B" ],
-  "_id_": "axc/o:032",
-  "_gpid_": 3739
+  "id": "axc/o:032",
+  "gpid": 3739
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
@ -5,16 +5,16 @@
  "capabilities": [ "NT", "no Gunshield" ],
  "note_number": "35",
  "notes": [ "A" ],
-  "_id_": "cr/o:000",
-  "_gpid_": 3772
+  "id": "cr/o:000",
+  "gpid": 3772
 },
 { "name": "Skoda M28(FE)",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "36",
  "notes": [ "A" ],
-  "_id_": "cr/o:001",
-  "_gpid_": 3774
+  "id": "cr/o:001",
+  "gpid": 3774
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/hungarian.json
@ -5,31 +5,31 @@
  "capabilities_other": [ "5PP" ],
  "note_number": "23",
  "notes": [ "A" ],
-  "_id_": "hu/o:000",
-  "_gpid_": 3679
+  "id": "hu/o:000",
+  "gpid": 3679
 },
 { "name": "40mm MAVAG 40 M",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "H": "7[9]\u2020" },
  "note_number": "24\u2020",
-  "_id_": "hu/o:001",
-  "_gpid_": 3993
+  "id": "hu/o:001",
+  "gpid": 3993
 },
 { "name": "Skoda M05/08",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "25",
  "notes": [ "A" ],
-  "_id_": "hu/o:002",
-  "_gpid_": 3999
+  "id": "hu/o:002",
+  "gpid": 3999
 },
 { "name": "105mm MAVAG M40",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "note_number": "26",
-  "_id_": "hu/o:003",
-  "_gpid_": 4001
+  "id": "hu/o:003",
+  "gpid": 4001
 },
 { "name": "Bofors 80mm M29/38",
  "type": "AA",
@ -37,8 +37,8 @@
  "capabilities2": { "LF": [ "80\u2020<sup>1</sup>", "1 ROF", "B11" ] },
  "note_number": "27\u2020",
  "notes": [ "G\u2020<sup>1</sup>" ],
-  "_id_": "hu/o:004",
-  "_gpid_": 4007
+  "id": "hu/o:004",
+  "gpid": 4007
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
@ -6,31 +6,31 @@
  "capabilities_other": [ "5PP" ],
  "note_number": "1",
  "notes": [ "A" ],
-  "_id_": "ro/o:000",
-  "_gpid_": 3682
+  "id": "ro/o:000",
+  "gpid": 3682
 },
 { "name": "Bofors 37mm",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "2\u2020",
  "notes": [ "A" ],
-  "_id_": "ro/o:001",
-  "_gpid_": 3740
+  "id": "ro/o:001",
+  "gpid": 3740
 },
 { "name": "45mm PTP obr. 32",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "3\u2020",
-  "_id_": "ro/o:002",
-  "_gpid_": 3741
+  "id": "ro/o:002",
+  "gpid": 3741
 },
 { "name": "Resita M43",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities_other": [ "Blk TH", "AP TK#18\u2020" ],
  "note_number": "4\u2020",
-  "_id_": "ro/o:003",
-  "_gpid_": 3742
+  "id": "ro/o:003",
+  "gpid": 3742
 },
 { "name": "76.2mm PaK 36(r)",
  "type": "AT",
@ -38,16 +38,16 @@
  "capabilities2": { "s": 7 },
  "note_number": "5",
  "notes": [ "K\u2020" ],
-  "_id_": "ro/o:004",
-  "_gpid_": 3743
+  "id": "ro/o:004",
+  "gpid": 3743
 },
 { "name": "Breda 47",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "no Gunshield" ],
  "note_number": "6\u2020",
  "notes": [ "A" ],
-  "_id_": "ro/o:005",
-  "_gpid_": 3744
+  "id": "ro/o:005",
+  "gpid": 3744
 },
 { "name": "75mm PP obr. 27",
  "type": "INF",
@ -55,8 +55,8 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "7",
  "notes": [ "A" ],
-  "_id_": "ro/o:006",
-  "_gpid_": 3745
+  "id": "ro/o:006",
+  "gpid": 3745
 },
 { "name": "75 M mle 28",
  "type": "ART",
@ -64,8 +64,8 @@
  "capabilities2": { "AP": 5, "s": 5 },
  "note_number": "8",
  "notes": [ "A" ],
-  "_id_": "ro/o:007",
-  "_gpid_": 3746
+  "id": "ro/o:007",
+  "gpid": 3746
 },
 { "name": "Skoda M14/34",
  "type": "ART",
@ -73,24 +73,24 @@
  "capabilities2": { "AP": 6 },
  "note_number": "9\u2020",
  "notes": [ "A" ],
-  "_id_": "ro/o:008",
-  "_gpid_": 3747
+  "id": "ro/o:008",
+  "gpid": 3747
 },
 { "name": "76.2mm P obr. 00/02",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "s": 7 },
  "note_number": "10",
-  "_id_": "ro/o:009",
-  "_gpid_": 3748
+  "id": "ro/o:009",
+  "gpid": 3748
 },
 { "name": "76.2mm P obr. 02/30",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "s": 7 },
  "note_number": "11",
-  "_id_": "ro/o:010",
-  "_gpid_": 3749
+  "id": "ro/o:010",
+  "gpid": 3749
 },
 { "name": "76.2mm P obr. 39(r)",
  "type": "ART",
@ -98,8 +98,8 @@
  "capabilities2": { "s": 5 },
  "note_number": "12",
  "notes": [ "K\u2020" ],
-  "_id_": "ro/o:011",
-  "_gpid_": 3750
+  "id": "ro/o:011",
+  "gpid": 3750
 },
 { "name": "s 10cm K 18(g)",
  "type": "ART",
@ -107,74 +107,74 @@
  "capabilities2": { "s": 5 },
  "note_number": "13",
  "notes": [ "E" ],
-  "_id_": "ro/o:012",
-  "_gpid_": 3751
+  "id": "ro/o:012",
+  "gpid": 3751
 },
 { "name": "Skoda M39(D9)",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "14",
-  "_id_": "ro/o:013",
-  "_gpid_": 3752
+  "id": "ro/o:013",
+  "gpid": 3752
 },
 { "name": "Canon de 105L mle 36S",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "15",
-  "_id_": "ro/o:014",
-  "_gpid_": 3753
+  "id": "ro/o:014",
+  "gpid": 3753
 },
 { "name": "Canon mle 10/12",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "capabilities2": { "s": 4 },
  "note_number": "16",
-  "_id_": "ro/o:015",
-  "_gpid_": 3754
+  "id": "ro/o:015",
+  "gpid": 3754
 },
 { "name": "OQF 4.5in",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 4 },
  "note_number": "17",
-  "_id_": "ro/o:016",
-  "_gpid_": 3755
+  "id": "ro/o:016",
+  "gpid": 3755
 },
 { "name": "Skoda M28 NOa",
  "type": "ART",
  "capabilities": [ "NM", "no IF" ],
  "capabilities_other": [ "ST" ],
  "note_number": "18",
-  "_id_": "ro/o:017",
-  "_gpid_": 3756
+  "id": "ro/o:017",
+  "gpid": 3756
 },
 { "name": "Skoda M33 (K1)",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "19",
-  "_id_": "ro/o:018",
-  "_gpid_": 3757
+  "id": "ro/o:018",
+  "gpid": 3757
 },
 { "name": "CA mle 38",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "20",
-  "_id_": "ro/o:019",
-  "_gpid_": 3758
+  "id": "ro/o:019",
+  "gpid": 3758
 },
 { "name": "Vickers/Resita M36/39",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "21\u2020",
-  "_id_": "ro/o:020",
-  "_gpid_": 3759
+  "id": "ro/o:020",
+  "gpid": 3759
 },
 { "name": "Kanon PL vz. 12/20",
  "type": "AA",
  "capabilities": [ "T", "NM" ],
  "note_number": "22",
-  "_id_": "ro/o:021",
-  "_gpid_": 3760
+  "id": "ro/o:021",
+  "gpid": 3760
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
@ -5,8 +5,8 @@
  "capabilities": [ "NT", "QSU" ],
  "note_number": "28",
  "notes": [ "A" ],
-  "_id_": "sl/o:000",
-  "_gpid_": 3761
+  "id": "sl/o:000",
+  "gpid": 3761
 },
 { "name": "Kanon PUV vz. 36(t)",
  "type": "AT",
@ -14,8 +14,8 @@
  "capabilities2": { "A": [ [5,1], [4,2] ] },
  "note_number": "29",
  "notes": [ "E" ],
-  "_id_": "sl/o:001",
-  "_gpid_": 3763
+  "id": "sl/o:001",
+  "gpid": 3763
 },
 { "name": "leIG 18(g)",
  "type": "INF",
@ -23,16 +23,16 @@
  "capabilities2": { "H": [ ["7","3+"] ] },
  "note_number": "30",
  "notes": [ "A", "E" ],
-  "_id_": "sl/o:002",
-  "_gpid_": 3764
+  "id": "sl/o:002",
+  "gpid": 3764
 },
 { "name": "Skoda M37(K4)",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 6 },
  "note_number": "31",
-  "_id_": "sl/o:003",
-  "_gpid_": 3765
+  "id": "sl/o:003",
+  "gpid": 3765
 },
 { "name": "Skoda 47L40(t)",
  "type": "AA",
@ -40,23 +40,23 @@
  "capabilities_other": [ "AA Fire ROF 2\u2020" ],
  "note_number": "32\u2020",
  "notes": [ "E" ],
-  "_id_": "sl/o:004",
-  "_gpid_": 3766
+  "id": "sl/o:004",
+  "gpid": 3766
 },
 { "name": "Skoda PL vz. 37(t)",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "33",
  "notes": [ "E" ],
-  "_id_": "sl/o:005",
-  "_gpid_": 3767
+  "id": "sl/o:005",
+  "gpid": 3767
 },
 { "name": "Kanon PL vz. 22/24",
  "type": "AA",
  "capabilities_other": [ "ST" ],
  "note_number": "34\u2020",
-  "_id_": "sl/o:006",
-  "_gpid_": 3768
+  "id": "sl/o:006",
+  "gpid": 3768
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/british.json
+++ b/vasl_templates/webapp/data/ordnance/british.json
@ -6,8 +6,8 @@
  "capabilities2": { "s": 7, "IR": [ [null,"2+"], "\u2020" ] },
  "note_number": "1",
  "notes": [ "A\u2020", "N", "P" ],
-  "_id_": "br/o:000",
-  "_gpid_": 1153
+  "id": "br/o:000",
+  "gpid": 1153
 },
 { "name": "OML 2-in. Airborne Mortar",
  "type": "MTR",
@ -15,8 +15,8 @@
  "capabilities2": { "s": 7 },
  "capabilities_other": [ "3PP" ],
  "note_number": "1",
-  "_id_": "br/o:001",
-  "_gpid_": 1149
+  "id": "br/o:001",
+  "gpid": 1149
 },
 { "name": "OML 3-in. Mortar",
  "type": "MTR",
@ -24,8 +24,8 @@
  "capabilities2": { "WP": 7, "s": [ [8,"1+"], "\u2020" ], "IR": [ [null,"2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "2\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "D", "N", "P" ],
-  "_id_": "br/o:002",
-  "_gpid_": [ 1177, 1179 ]
+  "id": "br/o:002",
+  "gpid": [ 1177, 1179 ]
 },
 { "name": "OSB 4.2-in. Mortar",
  "type": "MTR",
@ -34,16 +34,16 @@
  "capabilities_other": [ "Towed\u2020" ],
  "note_number": "3\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:003",
-  "_gpid_": 1181
+  "id": "br/o:003",
+  "gpid": 1181
 },
 { "name": "OQF 25mm Hotchkiss",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "4\u2020",
  "notes": [ "B", "N" ],
-  "_id_": "br/o:004",
-  "_gpid_": 1183
+  "id": "br/o:004",
+  "gpid": 1183
 },
 { "name": "OQF 2-Pounder",
  "type": "AT",
@ -51,8 +51,8 @@
  "capabilities2": { "LF": [ "NT", "40\u2020<sup>1</sup>", "2 ROF", "B11" ] },
  "note_number": "5\u2020",
  "notes": [ "B", "C\u2020<sup>1</sup>", "N", "P" ],
-  "_id_": "br/o:005",
-  "_gpid_": 1184
+  "id": "br/o:005",
+  "gpid": 1184
 },
 { "name": "OQF 6-Pounder 7-cwt",
  "type": "AT",
@ -60,24 +60,24 @@
  "capabilities2": { "HE": [ [7,"F3"], [8,"4+"], "\u2020" ], "D": [ [6,"J4E"], [7,5], "\u2020" ] },
  "note_number": "6\u2020",
  "notes": [ "B", "N", "P" ],
-  "_id_": "br/o:006",
-  "_gpid_": 1185
+  "id": "br/o:006",
+  "gpid": 1185
 },
 { "name": "OQF 17/25-Pounder",
  "type": "AT",
  "capabilities": [ "NT" ],
  "note_number": "7",
  "notes": [ "N" ],
-  "_id_": "br/o:007",
-  "_gpid_": 1186
+  "id": "br/o:007",
+  "gpid": 1186
 },
 { "name": "OQF 17-Pounder",
  "type": "AT",
  "capabilities": [ "NT" ],
  "capabilities2": { "HE": [ [8,"J4+"], "\u2020" ], "D": [ [5,"S4"], [6,5], "\u2020" ] },
  "note_number": "8\u2020",
-  "_id_": "br/o:008",
-  "_gpid_": 1187
+  "id": "br/o:008",
+  "gpid": 1187
 },
 { "name": "OQF M1A1 75mm Pack Howitzer",
  "type": "ART",
@ -85,8 +85,8 @@
  "capabilities2": { "H": 6, "WP": 7 },
  "note_number": "9\u2020",
  "notes": [ "D", "P" ],
-  "_id_": "br/o:009",
-  "_gpid_": 1189
+  "id": "br/o:009",
+  "gpid": 1189
 },
 { "name": "Canon de 75 mle 1897",
  "type": "ART",
@ -94,8 +94,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "10\u2020",
  "notes": [ "B", "N" ],
-  "_id_": "br/o:010",
-  "_gpid_": 1191
+  "id": "br/o:010",
+  "gpid": 1191
 },
 { "name": "OQF 18-Pounder",
  "type": "ART",
@ -103,8 +103,8 @@
  "capabilities2": { "s": 8, "WP": 7 },
  "note_number": "11\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:011",
-  "_gpid_": 1192
+  "id": "br/o:011",
+  "gpid": 1192
 },
 { "name": "OQF 25-Pounder Short",
  "type": "ART",
@ -112,8 +112,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "12",
  "notes": [ "D", "P" ],
-  "_id_": "br/o:012",
-  "_gpid_": 1193
+  "id": "br/o:012",
+  "gpid": 1193
 },
 { "name": "OQF 25-Pounder Gun-Howitzer",
  "type": "ART",
@ -121,8 +121,8 @@
  "capabilities_other": [ "ST" ],
  "note_number": "13\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:013",
-  "_gpid_": 1194
+  "id": "br/o:013",
+  "gpid": 1194
 },
 { "name": "OQF 3.7-in. Howitzer",
  "type": "ART",
@ -130,8 +130,8 @@
  "capabilities2": { "s": 8, "WP": 7, "H": [ [6,"3+P"], "\u2020" ] },
  "note_number": "14\u2020",
  "notes": [ "D", "N", "P" ],
-  "_id_": "br/o:014",
-  "_gpid_": 1195
+  "id": "br/o:014",
+  "gpid": 1195
 },
 { "name": "OQF 4.5-in. Howitzer",
  "type": "ART",
@ -139,32 +139,32 @@
  "capabilities2": { "s": 8, "WP": 7 },
  "note_number": "15\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:015",
-  "_gpid_": 1196
+  "id": "br/o:015",
+  "gpid": 1196
 },
 { "name": "OBL 4.5-in. Gun",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "16\u2020",
  "notes": [ "N" ],
-  "_id_": "br/o:016",
-  "_gpid_": 1197
+  "id": "br/o:016",
+  "gpid": 1197
 },
 { "name": "OBL 5.5-in. Gun-Howitzer",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "16\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:017",
-  "_gpid_": 1198
+  "id": "br/o:017",
+  "gpid": 1198
 },
 { "name": "OBL 6-in. Howitzer",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "17\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:018",
-  "_gpid_": 1199
+  "id": "br/o:018",
+  "gpid": 1199
 },
 { "name": "OBL 7.2-in. Howitzer Mk I",
  "type": "ART",
@ -172,23 +172,23 @@
  "capabilities_other": [ "Acq. NA\u2020" ],
  "note_number": "18\u2020",
  "notes": [ "N", "P" ],
-  "_id_": "br/o:019",
-  "_gpid_": 1200
+  "id": "br/o:019",
+  "gpid": 1200
 },
 { "name": "OBL 7.2-in. Howitzer Mk VI",
  "type": "ART",
  "capabilities": [ "NT", "RFNM", "no IF" ],
  "note_number": "19\u2020",
  "notes": [ "P" ],
-  "_id_": "br/o:020",
-  "_gpid_": 1201
+  "id": "br/o:020",
+  "gpid": 1201
 },
 { "name": "OQF 20mm AA",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "20",
-  "_id_": "br/o:021",
-  "_gpid_": 1203
+  "id": "br/o:021",
+  "gpid": 1203
 },
 { "name": "OQF 40mm AA",
  "type": "AA",
@ -196,24 +196,24 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "21\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N", "P" ],
-  "_id_": "br/o:022",
-  "_gpid_": 1204
+  "id": "br/o:022",
+  "gpid": 1204
 },
 { "name": "OQF 3-in. 20-cwt AA",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "22\u2020",
  "notes": [ "E", "P" ],
-  "_id_": "br/o:023",
-  "_gpid_": 1205
+  "id": "br/o:023",
+  "gpid": 1205
 },
 { "name": "OQF 3.7-in. AA",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "23\u2020",
  "notes": [ "E", "N", "P" ],
-  "_id_": "br/o:024",
-  "_gpid_": 1206
+  "id": "br/o:024",
+  "gpid": 1206
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/chinese.json
+++ b/vasl_templates/webapp/data/ordnance/chinese.json
@ -5,32 +5,32 @@
  "capabilities_other": [ "2PP", "Air Bursts NA\u2020" ],
  "note_number": "1\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/o:000",
-  "_gpid_": 1982
+  "id": "ch/o:000",
+  "gpid": 1982
 },
 { "name": "Mortaio da 45 \"Brixia\"",
  "type": "MTR",
  "capabilities_other": [ "4PP" ],
  "note_number": "2",
  "notes": [ "A", "D\u2020" ],
-  "_id_": "ch/o:001",
-  "_gpid_": [ 1983, 1984 ]
+  "id": "ch/o:001",
+  "gpid": [ 1983, 1984 ]
 },
 { "name": "5cm leGrW 36",
  "type": "MTR",
  "capabilities_other": [ "5PP" ],
  "note_number": "2",
  "notes": [ "A" ],
-  "_id_": "ch/o:002",
-  "_gpid_": 1985
+  "id": "ch/o:002",
+  "gpid": 1985
 },
 { "name": "50mm RM obr. 38",
  "type": "MTR",
  "capabilities_other": [ "5PP" ],
  "note_number": "2",
  "notes": [ "A" ],
-  "_id_": "ch/o:003",
-  "_gpid_": 1986
+  "id": "ch/o:003",
+  "gpid": 1986
 },
 { "name": "Type 89 Heavy Grenade Launcher",
  "type": "MTR",
@ -39,8 +39,8 @@
  "capabilities_other": [ "4PP" ],
  "note_number": "2\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/o:004",
-  "_gpid_": 1987
+  "id": "ch/o:004",
+  "gpid": 1987
 },
 { "name": "M2 60mm",
  "type": "MTR",
@ -48,16 +48,16 @@
  "capabilities_other": [ "5PP", "OBA\u2020" ],
  "note_number": "3\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/o:005",
-  "_gpid_": 1988
+  "id": "ch/o:005",
+  "gpid": 1988
 },
 { "name": "Stokes 3-in.",
  "type": "MTR",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "4",
  "notes": [ "A", "E\u2020" ],
-  "_id_": "ch/o:006",
-  "_gpid_": 2016
+  "id": "ch/o:006",
+  "gpid": 2016
 },
 { "name": "8cm GrW 34",
  "type": "MTR",
@ -65,8 +65,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "4",
  "notes": [ "A", "E\u2020" ],
-  "_id_": "ch/o:007",
-  "_gpid_": 2018
+  "id": "ch/o:007",
+  "gpid": 2018
 },
 { "name": "82mm BM obr. 37",
  "type": "MTR",
@ -74,8 +74,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "4",
  "notes": [ "A", "E\u2020" ],
-  "_id_": "ch/o:008",
-  "_gpid_": 2020
+  "id": "ch/o:008",
+  "gpid": 2020
 },
 { "name": "M1 81mm",
  "type": "MTR",
@ -83,8 +83,8 @@
  "capabilities2": { "WP": 7 },
  "note_number": "5",
  "notes": [ "A", "B" ],
-  "_id_": "ch/o:009",
-  "_gpid_": 2022
+  "id": "ch/o:009",
+  "gpid": 2022
 },
 { "name": "M2 4.2-in.",
  "type": "MTR",
@ -92,16 +92,16 @@
  "capabilities2": { "WP": 9 },
  "note_number": "5\u2020",
  "notes": [ "B" ],
-  "_id_": "ch/o:010",
-  "_gpid_": 2024
+  "id": "ch/o:010",
+  "gpid": 2024
 },
 { "name": "3.7cm PaK 35/36",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "6",
  "notes": [ "E\u2020" ],
-  "_id_": "ch/o:011",
-  "_gpid_": 2026
+  "id": "ch/o:011",
+  "gpid": 2026
 },
 { "name": "M3A1 37mm",
  "type": "AT",
@ -109,8 +109,8 @@
  "capabilities2": { "C": "7\u2020<sup>1</sup>" },
  "note_number": "6\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:012",
-  "_gpid_": 2027
+  "id": "ch/o:012",
+  "gpid": 2027
 },
 { "name": "37mm PP obr. 15R",
  "type": "ART",
@ -118,16 +118,16 @@
  "capabilities_other": [ "Low Ammo\u2020" ],
  "note_number": "7\u2020",
  "notes": [ "<s>B</s>" ],
-  "_id_": "ch/o:013",
-  "_gpid_": 2029
+  "id": "ch/o:013",
+  "gpid": 2029
 },
 { "name": "Cannone da 70/15",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "Acq. NA\u2020", "Low Ammo\u2020", "h-d" ],
  "note_number": "7\u2020",
  "notes": [ "A", "<s>B</s>" ],
-  "_id_": "ch/o:014",
-  "_gpid_": 2030
+  "id": "ch/o:014",
+  "gpid": 2030
 },
 { "name": "7.5cm Krupp M08",
  "type": "ART",
@ -135,23 +135,23 @@
  "capabilities2": { "s": 5, "AP": 5 },
  "note_number": "8",
  "notes": [ "A", "F\u2020" ],
-  "_id_": "ch/o:015",
-  "_gpid_": 2031
+  "id": "ch/o:015",
+  "gpid": 2031
 },
 { "name": "Obice da 75/13",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "8",
  "notes": [ "A", "D\u2020", "F\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:016",
-  "_gpid_": [ 2032, 2033 ]
+  "id": "ch/o:016",
+  "gpid": [ 2032, 2033 ]
 },
 { "name": "7.5cm leIG 18",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "9\u2020",
-  "_id_": "ch/o:017",
-  "_gpid_": 2034
+  "id": "ch/o:017",
+  "gpid": 2034
 },
 { "name": "76.2mm PP obr. 27",
  "type": "ART",
@ -159,8 +159,8 @@
  "capabilities2": { "s": 6, "AP": 6 },
  "note_number": "9\u2020<sup>1</sup>",
  "notes": [ "D\u2020" ],
-  "_id_": "ch/o:018",
-  "_gpid_": [ 2035, 2036 ]
+  "id": "ch/o:018",
+  "gpid": [ 2035, 2036 ]
 },
 { "name": "M1A1 75mm Pack Howitzer",
  "type": "ART",
@ -168,8 +168,8 @@
  "capabilities2": { "WP": 7, "C": "5\u2020<sup>1</sup>" },
  "note_number": "10\u2020",
  "notes": [ "A", "C \u2020<sup>1</sup>" ],
-  "_id_": "ch/o:019",
-  "_gpid_": 2037
+  "id": "ch/o:019",
+  "gpid": 2037
 },
 { "name": "7.7cm FK 16",
  "type": "ART",
@ -177,8 +177,8 @@
  "capabilities2": { "s": 5, "AP": 6 },
  "note_number": "11",
  "notes": [ "F\u2020" ],
-  "_id_": "ch/o:020",
-  "_gpid_": 2039
+  "id": "ch/o:020",
+  "gpid": 2039
 },
 { "name": "76.2mm P obr. 02/30",
  "type": "ART",
@ -186,8 +186,8 @@
  "capabilities2": { "s": 6, "AP": 6 },
  "note_number": "11",
  "notes": [ "D\u2020", "F\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:021",
-  "_gpid_": [ 2040, 2041 ]
+  "id": "ch/o:021",
+  "gpid": [ 2040, 2041 ]
 },
 { "name": "OQF 18-Pounder",
  "type": "ART",
@ -195,8 +195,8 @@
  "capabilities2": { "s": 6, "WP": 5, "AP": 6 },
  "note_number": "11",
  "notes": [ "<s>B</s>" ],
-  "_id_": "ch/o:022",
-  "_gpid_": 2042
+  "id": "ch/o:022",
+  "gpid": 2042
 },
 { "name": "10.5cm leFH 16",
  "type": "ART",
@ -204,8 +204,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "12\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/o:023",
-  "_gpid_": 2043
+  "id": "ch/o:023",
+  "gpid": 2043
 },
 { "name": "Cannone da 105/28",
  "type": "ART",
@ -213,8 +213,8 @@
  "capabilities2": { "s": 6, "AP": 5 },
  "note_number": "12",
  "notes": [ "F\u2020" ],
-  "_id_": "ch/o:024",
-  "_gpid_": 2044
+  "id": "ch/o:024",
+  "gpid": 2044
 },
 { "name": "M2A1 105mm Howitzer",
  "type": "ART",
@ -222,8 +222,8 @@
  "capabilities2": { "s": 6, "WP": 7, "C": "5\u2020" },
  "note_number": "12",
  "notes": [ "B", "C\u2020" ],
-  "_id_": "ch/o:025",
-  "_gpid_": 2045
+  "id": "ch/o:025",
+  "gpid": 2045
 },
 { "name": "122mm G obr. 10/30",
  "type": "ART",
@ -231,8 +231,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "13",
  "notes": [ "<s>B</s>", "D\u2020" ],
-  "_id_": "ch/o:026",
-  "_gpid_": [ 2046, 5852 ]
+  "id": "ch/o:026",
+  "gpid": [ 2046, 5852 ]
 },
 { "name": "122mm G obr. 38",
  "type": "ART",
@ -240,16 +240,16 @@
  "capabilities2": { "s": 6 },
  "note_number": "13",
  "notes": [ "<s>B</s>", "D\u2020" ],
-  "_id_": "ch/o:027",
-  "_gpid_": [ 2048, 5853 ]
+  "id": "ch/o:027",
+  "gpid": [ 2048, 5853 ]
 },
 { "name": "Obice da 149/13",
  "type": "ART",
  "capabilities": [ "NT", "h-d<sup>C</sup>\u2020" ],
  "capabilities2": { "s": 5, "WP": [ [6,"B"], "\u2020" ] },
  "note_number": "14\u2020",
-  "_id_": "ch/o:028",
-  "_gpid_": 2050
+  "id": "ch/o:028",
+  "gpid": 2050
 },
 { "name": "Oerlikon FF",
  "type": "AA",
@ -257,8 +257,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B10" ] },
  "note_number": "15\u2020<sup>1</sup>",
  "notes": [ "G\u2020" ],
-  "_id_": "ch/o:029",
-  "_gpid_": 2052
+  "id": "ch/o:029",
+  "gpid": 2052
 },
 { "name": "Cannone-mitragliera da 20/65",
  "type": "AA",
@ -266,8 +266,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "15\u2020<sup>2</sup>",
  "notes": [ "D\u2020", "G\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:030",
-  "_gpid_": [ 2053, 5854 ]
+  "id": "ch/o:030",
+  "gpid": [ 2053, 5854 ]
 },
 { "name": "2cm FlaK 30",
  "type": "AA",
@ -275,8 +275,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B10" ] },
  "note_number": "15\u2020<sup>1</sup>",
  "notes": [ "G\u2020" ],
-  "_id_": "ch/o:031",
-  "_gpid_": 2055
+  "id": "ch/o:031",
+  "gpid": 2055
 },
 { "name": "3.7cm FlaK 36 o. 37",
  "type": "AA",
@ -284,8 +284,8 @@
  "capabilities2": { "AP": 6 },
  "note_number": "16",
  "notes": [ "<s>B</s>" ],
-  "_id_": "ch/o:032",
-  "_gpid_": 2056
+  "id": "ch/o:032",
+  "gpid": 2056
 },
 { "name": "Bofors 40mm L/60",
  "type": "AA",
@ -293,8 +293,8 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ], "AP": 6 },
  "note_number": "16\u2020",
  "notes": [ "G\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:033",
-  "_gpid_": 2057
+  "id": "ch/o:033",
+  "gpid": 2057
 },
 { "name": "Bofors 75mm M29",
  "type": "AA",
@ -302,8 +302,8 @@
  "capabilities2": { "LF": [ "75\u2020<sup>1</sup>", "1 ROF", "B10\u2020" ], "AP": 6 },
  "note_number": "17",
  "notes": [ "<s>B</s>", "D\u2020", "G\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:034",
-  "_gpid_": [ 2058, 5855 ]
+  "id": "ch/o:034",
+  "gpid": [ 2058, 5855 ]
 },
 { "name": "8.8cm FlaK 18",
  "type": "AA",
@ -311,8 +311,8 @@
  "capabilities2": { "LF": [ "88\u2020<sup>1</sup>", "1 ROF", "B10\u2020" ], "AP": 6 },
  "note_number": "17",
  "notes": [ "<s>B</s>", "D\u2020", "G\u2020<sup>1</sup>" ],
-  "_id_": "ch/o:035",
-  "_gpid_": [ 2060, 5856 ]
+  "id": "ch/o:035",
+  "gpid": [ 2060, 5856 ]
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
+++ b/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
@ -0,0 +1,143 @@
+[
+
+{ "name": "M1A1 Rocket Launcher",
+  "type": null,
+  "capabilities_other": [ "1PP" ],
+  "note_number": "16",
+  "id": "cvpa/o:000",
+  "gpid": null
+},
+{ "name": "Type 51 Rocket Launcher",
+  "type": null,
+  "capabilities_other": [ "1PP" ],
+  "note_number": "17",
+  "id": "cvpa/o:001",
+  "gpid": null
+},
+{ "name": "50mm Type 89 Heavy Grenade Launcher",
+  "type": "MTR",
+  "capabilities_other": [ "4PP" ],
+  "note_number": "18\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:002",
+  "gpid": null
+},
+{ "name": "60mm Type 31 Mortar",
+  "type": "MTR",
+  "capabilities_other": [ "5PP" ],
+  "note_number": "19",
+  "notes": [ "A" ],
+  "id": "cvpa/o:003",
+  "gpid": null
+},
+{ "name": "82mm Type 20 Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU" ],
+  "note_number": "20\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:004",
+  "gpid": null
+},
+{ "name": "82mm Type 53 Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "s": 6 },
+  "note_number": "21\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:005",
+  "gpid": null
+},
+{ "name": "120mm PM obr. 38",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "s": 6 },
+  "note_number": "22\u2020",
+  "id": "cvpa/o:006",
+  "gpid": null
+},
+{ "name": "45mm PTP obr. 42",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 7 },
+  "note_number": "23\u2020",
+  "id": "cvpa/o:007",
+  "gpid": null
+},
+{ "name": "47mm Type 1 Machine-Moved Gun",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "note_number": "24\u2020",
+  "id": "cvpa/o:008",
+  "gpid": null
+},
+{ "name": "57mm PTP obr. 43",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 6 },
+  "note_number": "25\u2020",
+  "id": "cvpa/o:009",
+  "gpid": null
+},
+{ "name": "57mm Type 36 Recoilless Rifle",
+  "type": "RCL",
+  "capabilities2": { "H": 6, "WP": 5 },
+  "capabilities_other": [ "3PP", "crewed\u2020" ],
+  "note_number": "26\u2020<sup>1</sup>",
+  "notes": [ "R\u2020" ],
+  "id": "cvpa/o:010",
+  "gpid": null
+},
+{ "name": "75mm Type 52 Recoilless Rifle",
+  "type": "RCL",
+  "capabilities2": { "H": 6, "WP": 5 },
+  "capabilities_other": [ "5PP", "crewed\u2020" ],
+  "note_number": "27",
+  "notes": [ "R\u2020" ],
+  "id": "cvpa/o:011",
+  "gpid": null
+},
+{ "name": "70mm Type 92 Infantry Gun",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "AP": 3, "H": 3 },
+  "note_number": "28\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:012",
+  "gpid": null
+},
+{ "name": "76.2mm PP obr. 27",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 6, "s": 6 },
+  "note_number": "29\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:013",
+  "gpid": null
+},
+{ "name": "Year-38 Type Field Gun (Improved)",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities_other": [ "\"12\" AP TK#\u2020" ],
+  "note_number": "30\u2020",
+  "id": "cvpa/o:014",
+  "gpid": null
+},
+{ "name": "76.2mm obr. 42",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 7, "s": 6 },
+  "note_number": "31\u2020",
+  "id": "cvpa/o:015",
+  "gpid": null
+},
+{ "name": "Type 93 Twin-Mount High-Angle Machine Gun",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities_other": [ "2 TK DR\u2020", "Towing NA\u2020" ],
+  "note_number": "32\u2020",
+  "notes": [ "A" ],
+  "id": "cvpa/o:016",
+  "gpid": null
+}
+
+]
--- a/vasl_templates/webapp/data/ordnance/communist-forces/kpa.json
+++ b/vasl_templates/webapp/data/ordnance/communist-forces/kpa.json
@ -0,0 +1,141 @@
+[
+
+{ "name": "50mm RM obr. 40",
+  "type": "MTR",
+  "capabilities_other": [ "4PP" ],
+  "note_number": "1",
+  "notes": [ "A", "B" ],
+  "id": "kpa/o:000",
+  "gpid": null
+},
+{ "name": "82mm BM obr. 37",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU", "IR" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "2\u2020",
+  "notes": [ "A", "B" ],
+  "id": "kpa/o:001",
+  "gpid": null
+},
+{ "name": "120mm PM obr. 38",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "3\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:002",
+  "gpid": null
+},
+{ "name": "14.5mm PTRD-41",
+  "type": "ATR",
+  "capabilities_other": [ "1PP" ],
+  "note_number": "4",
+  "notes": [ "B" ],
+  "id": "kpa/o:003",
+  "gpid": null
+},
+{ "name": "14.5mm PTRS-41",
+  "type": "ATR",
+  "capabilities_other": [ "2PP", "TK#: 6\u2020" ],
+  "note_number": "5\u2020",
+  "id": "kpa/o:004",
+  "gpid": null
+},
+{ "name": "45mm PTP obr. 37",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 7 },
+  "note_number": "6\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:005",
+  "gpid": null
+},
+{ "name": "45mm PTP obr. 42",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 7 },
+  "note_number": "6\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:006",
+  "gpid": null
+},
+{ "name": "76.2mm PP obr. 27",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 6, "s": 8 },
+  "note_number": "7\u2020",
+  "notes": [ "A", "B" ],
+  "id": "kpa/o:007",
+  "gpid": null
+},
+{ "name": "76.2mm obr. 02/30",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "8\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:008",
+  "gpid": null
+},
+{ "name": "76.2mm obr. 42",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": 7, "s": 8 },
+  "note_number": "9\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:009",
+  "gpid": null
+},
+{ "name": "107mm P obr. 10/30",
+  "type": "ART",
+  "capabilities": [ "NT", "h-d" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "10",
+  "notes": [ "B" ],
+  "id": "kpa/o:010",
+  "gpid": null
+},
+{ "name": "122mm G obr. 38",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "H": 6, "s": 8 },
+  "note_number": "11\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:011",
+  "gpid": null
+},
+{ "name": "122mm obr. 31",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "12",
+  "notes": [ "B" ],
+  "id": "kpa/o:012",
+  "gpid": null
+},
+{ "name": "152mm GP obr. 37",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "note_number": "13",
+  "notes": [ "B" ],
+  "id": "kpa/o:013",
+  "gpid": null
+},
+{ "name": "37mm ZP obr. 39",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "note_number": "14\u2020",
+  "notes": [ "B" ],
+  "id": "kpa/o:014",
+  "gpid": null
+},
+{ "name": "85mm ZP obr. 39",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "note_number": "15",
+  "notes": [ "B" ],
+  "id": "kpa/o:015",
+  "gpid": null
+}
+
+]
--- a/vasl_templates/webapp/data/ordnance/finnish.json
+++ b/vasl_templates/webapp/data/ordnance/finnish.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "2PP" ],
  "note_number": "1",
  "notes": [ "A" ],
-  "_id_": "fi/o:000",
-  "_gpid_": 6730
+  "id": "fi/o:000",
+  "gpid": 6730
 },
 { "name": "50 Krh/39(r)",
  "type": "MTR",
@ -14,8 +14,8 @@
  "capabilities2": { "B": [ [12,"3+"], "\u2020" ] },
  "note_number": "2\u2020",
  "notes": [ "A", "B" ],
-  "_id_": "fi/o:001",
-  "_gpid_": 3605
+  "id": "fi/o:001",
+  "gpid": 3605
 },
 { "name": "81 Krh/32",
  "type": "MTR",
@ -24,8 +24,8 @@
  "capabilities_other": [ "5PP dm" ],
  "note_number": "3\u2020",
  "notes": [ "A" ],
-  "_id_": "fi/o:002",
-  "_gpid_": 6765
+  "id": "fi/o:002",
+  "gpid": 6765
 },
 { "name": "81 Savunheitin M/42",
  "type": "MTR",
@ -33,30 +33,30 @@
  "capabilities_other": [ "s\u2020", "4PP dm" ],
  "note_number": "4\u2020",
  "notes": [ "A" ],
-  "_id_": "fi/o:003",
-  "_gpid_": 6782
+  "id": "fi/o:003",
+  "gpid": 6782
 },
 { "name": "120 Krh/40",
  "type": "MTR",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "5\u2020",
-  "_id_": "fi/o:004",
-  "_gpid_": 6806
+  "id": "fi/o:004",
+  "gpid": 6806
 },
 { "name": "Boys ATR(b)",
  "type": "ATR",
  "capabilities_other": [ "1PP", "\"British\"\u2020" ],
  "note_number": "6\u2020",
-  "_id_": "fi/o:005",
-  "_gpid_": null
+  "id": "fi/o:005",
+  "gpid": null
 },
 { "name": "Lahti ATR",
  "type": "ATR",
  "capabilities_other": [ "4PP", "Light AA fire in 44+\u2020", "B30.35\u2020" ],
  "note_number": "7\u2020",
  "notes": [ "A" ],
-  "_id_": "fi/o:006",
-  "_gpid_": 3608
+  "id": "fi/o:006",
+  "gpid": 3608
 },
 { "name": "20 PstK/40",
  "type": "AT",
@ -64,16 +64,16 @@
  "capabilities_other": [ "R2", "IFE=B10" ],
  "note_number": "8\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:007",
-  "_gpid_": 6808
+  "id": "fi/o:007",
+  "gpid": 6808
 },
 { "name": "25 PstK/37(f)",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "9\u2020",
  "notes": [ "B", "D" ],
-  "_id_": "fi/o:008",
-  "_gpid_": 6810
+  "id": "fi/o:008",
+  "gpid": 6810
 },
 { "name": "37 PstK/36(s)",
  "type": "AT",
@ -81,8 +81,8 @@
  "capabilities2": { "HE": [ [null,"1+"], "\u2020" ] },
  "note_number": "10\u2020",
  "notes": [ "A", "B" ],
-  "_id_": "fi/o:009",
-  "_gpid_": 6811
+  "id": "fi/o:009",
+  "gpid": 6811
 },
 { "name": "37 PstK/37(g)",
  "type": "AT",
@ -90,16 +90,16 @@
  "capabilities2": { "H": [ ["6[9]","3+"], "\u2020" ] },
  "note_number": "11\u2020",
  "notes": [ "B", "D" ],
-  "_id_": "fi/o:010",
-  "_gpid_": 6812
+  "id": "fi/o:010",
+  "gpid": 6812
 },
 { "name": "45 PstK/32(r)",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "12\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:011",
-  "_gpid_": 6813
+  "id": "fi/o:011",
+  "gpid": 6813
 },
 { "name": "50 PstK/38(g)",
  "type": "AT",
@ -107,8 +107,8 @@
  "capabilities2": { "A": 4 },
  "note_number": "13",
  "notes": [ "B" ],
-  "_id_": "fi/o:012",
-  "_gpid_": 6814
+  "id": "fi/o:012",
+  "gpid": 6814
 },
 { "name": "75 PstK/97-38(g)",
  "type": "AT",
@ -117,8 +117,8 @@
  "capabilities_other": [ "H=B12" ],
  "note_number": "14\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:013",
-  "_gpid_": 6815
+  "id": "fi/o:013",
+  "gpid": 6815
 },
 { "name": "75 PstK/40(g)",
  "type": "AT",
@ -126,8 +126,8 @@
  "capabilities2": { "A": 3, "H": 4, "s": 7 },
  "note_number": "15",
  "notes": [ "B" ],
-  "_id_": "fi/o:014",
-  "_gpid_": 6816
+  "id": "fi/o:014",
+  "gpid": 6816
 },
 { "name": "76 RK/27(r)",
  "type": "INF",
@ -135,24 +135,24 @@
  "capabilities2": { "H": [ ["6","J4+"], "\u2020" ], "s": 6 },
  "note_number": "16\u2020",
  "notes": [ "A", "B" ],
-  "_id_": "fi/o:015",
-  "_gpid_": 6818
+  "id": "fi/o:015",
+  "gpid": 6818
 },
 { "name": "75 K/02",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "s": 6 },
  "note_number": "17\u2020",
-  "_id_": "fi/o:016",
-  "_gpid_": 6819
+  "id": "fi/o:016",
+  "gpid": 6819
 },
 { "name": "76 LK/13",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "s": 6 },
  "note_number": "18",
-  "_id_": "fi/o:017",
-  "_gpid_": 6820
+  "id": "fi/o:017",
+  "gpid": 6820
 },
 { "name": "76 K/02(r)",
  "type": "ART",
@ -160,8 +160,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "19\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:018",
-  "_gpid_": 6821
+  "id": "fi/o:018",
+  "gpid": 6821
 },
 { "name": "76 K/36(r)",
  "type": "ART",
@ -169,8 +169,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "20\u2020",
  "notes": [ "B", "E\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:019",
-  "_gpid_": 6822
+  "id": "fi/o:019",
+  "gpid": 6822
 },
 { "name": "87 K/95",
  "type": "ART",
@ -178,16 +178,16 @@
  "capabilities_other": [ "Acq. NA\u2020" ],
  "note_number": "21",
  "notes": [ "F\u2020" ],
-  "_id_": "fi/o:020",
-  "_gpid_": 6823
+  "id": "fi/o:020",
+  "gpid": 6823
 },
 { "name": "90 K/77",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
  "note_number": "22\u2020",
  "notes": [ "F\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:021",
-  "_gpid_": 6824
+  "id": "fi/o:021",
+  "gpid": 6824
 },
 { "name": "105 H/33(g)",
  "type": "ART",
@ -195,16 +195,16 @@
  "capabilities2": { "H": [ [6,"A4+"], "\u2020" ], "s": 8 },
  "note_number": "23\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:022",
-  "_gpid_": 6826
+  "id": "fi/o:022",
+  "gpid": 6826
 },
 { "name": "105 H/37",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 6 },
  "note_number": "24\u2020",
-  "_id_": "fi/o:023",
-  "_gpid_": 6827
+  "id": "fi/o:023",
+  "gpid": 6827
 },
 { "name": "105 H/41(t)",
  "type": "ART",
@ -212,32 +212,32 @@
  "capabilities2": { "H": [ [6,"A4+"], "\u2020" ], "s": 8 },
  "note_number": "25\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:024",
-  "_gpid_": 6828
+  "id": "fi/o:024",
+  "gpid": 6828
 },
 { "name": "107 K 10/13",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 5 },
  "note_number": "26\u2020",
-  "_id_": "fi/o:025",
-  "_gpid_": 6829
+  "id": "fi/o:025",
+  "gpid": 6829
 },
 { "name": "107 K/77(r)",
  "type": "ART",
  "capabilities": [ "NT", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
  "note_number": "27\u2020",
  "notes": [ "B", "F\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:026",
-  "_gpid_": 6830
+  "id": "fi/o:026",
+  "gpid": 6830
 },
 { "name": "114 H/18(b)",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "H": [ [4,"4+"] ], "s": 8, "WP": [ [6,"4+"] ] },
  "note_number": "28\u2020",
-  "_id_": "fi/o:027",
-  "_gpid_": 6831
+  "id": "fi/o:027",
+  "gpid": 6831
 },
 { "name": "122 H/10(r)",
  "type": "ART",
@ -245,8 +245,8 @@
  "capabilities2": { "s": 6, "WP": [ [6,"4+"] ] },
  "note_number": "29\u2020",
  "notes": [ "B" ],
-  "_id_": "fi/o:028",
-  "_gpid_": 6832
+  "id": "fi/o:028",
+  "gpid": 6832
 },
 { "name": "150 H/40(g)",
  "type": "ART",
@ -254,8 +254,8 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "30",
  "notes": [ "B" ],
-  "_id_": "fi/o:029",
-  "_gpid_": 6833
+  "id": "fi/o:029",
+  "gpid": 6833
 },
 { "name": "155 H/17(f)",
  "type": "ART",
@ -263,8 +263,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "31",
  "notes": [ "B" ],
-  "_id_": "fi/o:030",
-  "_gpid_": 6834
+  "id": "fi/o:030",
+  "gpid": 6834
 },
 { "name": "7.62 ItKK/31-40",
  "type": "AA",
@ -272,8 +272,8 @@
  "capabilities_other": [ "2 TK DR\u2020" ],
  "note_number": "32\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:031",
-  "_gpid_": 6796
+  "id": "fi/o:031",
+  "gpid": 6796
 },
 { "name": "20 ItK/30 BSW(g)",
  "type": "AA",
@ -281,8 +281,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B10" ] },
  "note_number": "33",
  "notes": [ "B", "G\u2020" ],
-  "_id_": "fi/o:032",
-  "_gpid_": 6797
+  "id": "fi/o:032",
+  "gpid": 6797
 },
 { "name": "20 ItK/38 BSW(g)",
  "type": "AA",
@ -290,8 +290,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF", "B11" ] },
  "note_number": "34\u2020",
  "notes": [ "B", "G\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:033",
-  "_gpid_": 6801
+  "id": "fi/o:033",
+  "gpid": 6801
 },
 { "name": "20 ItK/35 Br",
  "type": "AA",
@ -300,8 +300,8 @@
  "capabilities_other": [ "Road MP = 1\u2020" ],
  "note_number": "35\u2020",
  "notes": [ "A", "D", "G\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:034",
-  "_gpid_": 6802
+  "id": "fi/o:034",
+  "gpid": 6802
 },
 { "name": "20 ItK/40 VKT",
  "type": "AA",
@ -310,8 +310,8 @@
  "capabilities_other": [ "2 TK DR\u2020", "Unhooking risk\u2020" ],
  "note_number": "36\u2020",
  "notes": [ "D", "G\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:035",
-  "_gpid_": 6803
+  "id": "fi/o:035",
+  "gpid": 6803
 },
 { "name": "40 ItK/35-39 B(s)",
  "type": "AA",
@ -319,8 +319,8 @@
  "capabilities2": { "LF": [ "40\u2020<sup>1</sup>", "2 ROF" ] },
  "note_number": "37\u2020",
  "notes": [ "B", "G\u2020<sup>1</sup>" ],
-  "_id_": "fi/o:036",
-  "_gpid_": 6804
+  "id": "fi/o:036",
+  "gpid": 6804
 },
 { "name": "76 ItK/28 B(s)",
  "type": "AA",
@ -328,16 +328,16 @@
  "capabilities2": { "LF": [ "NT", "76\u2020", "1 ROF" ] },
  "note_number": "38",
  "notes": [ "B", "G\u2020" ],
-  "_id_": "fi/o:037",
-  "_gpid_": 7409
+  "id": "fi/o:037",
+  "gpid": 7409
 },
 { "name": "76 ItK/31(r)",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "39",
  "notes": [ "B", "E\u2020" ],
-  "_id_": "fi/o:038",
-  "_gpid_": 6805
+  "id": "fi/o:038",
+  "gpid": 6805
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/french.json
+++ b/vasl_templates/webapp/data/ordnance/french.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "2PP", "crewed\u2020" ],
  "note_number": "1",
  "notes": [ "A", "B", "C\u2020", "E" ],
-  "_id_": "fr/o:000",
-  "_gpid_": 1636
+  "id": "fr/o:000",
+  "gpid": 1636
 },
 { "name": "Mortier de 60 mle 35",
  "type": "MTR",
@ -14,8 +14,8 @@
  "capabilities2": { "IR": [ [null,"2+"], "\u2020" ] },
  "note_number": "2\u2020",
  "notes": [ "A", "B", "V" ],
-  "_id_": "fr/o:001",
-  "_gpid_": 1641
+  "id": "fr/o:001",
+  "gpid": 1641
 },
 { "name": "Mortier de 81 mle 27/31",
  "type": "MTR",
@ -23,32 +23,32 @@
  "capabilities2": { "s": 8 },
  "note_number": "3\u2020",
  "notes": [ "A", "B", "D", "V" ],
-  "_id_": "fr/o:002",
-  "_gpid_": 1667
+  "id": "fr/o:002",
+  "gpid": 1667
 },
 { "name": "Fusil Antichar Boys",
  "type": "ATR",
  "capabilities_other": [ "1PP" ],
  "note_number": "4\u2020",
  "notes": [ "B" ],
-  "_id_": "fr/o:003",
-  "_gpid_": null
+  "id": "fr/o:003",
+  "gpid": null
 },
 { "name": "Canon AC de 25 SA-L mle 34",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "5\u2020",
  "notes": [ "B", "P" ],
-  "_id_": "fr/o:004",
-  "_gpid_": 1669
+  "id": "fr/o:004",
+  "gpid": 1669
 },
 { "name": "Canon AC de 47 SA mle 37 APX",
  "type": "AT",
  "capabilities": [ "NT", "QSU", "APCR only\u2020<sup>1</sup>" ],
  "note_number": "6\u2020<sup>1</sup>",
  "notes": [ "B", "G\u2020", "P", "V" ],
-  "_id_": "fr/o:005",
-  "_gpid_": [ 1670, 1671, 1672 ]
+  "id": "fr/o:005",
+  "gpid": [ 1670, 1671, 1672 ]
 },
 { "name": "Canon de 75 AC mle 97/35",
  "type": "AT",
@ -57,24 +57,24 @@
  "capabilities_other": [ "ST", "no shield" ],
  "note_number": "7",
  "notes": [ "E" ],
-  "_id_": "fr/o:006",
-  "_gpid_": 1673
+  "id": "fr/o:006",
+  "gpid": 1673
 },
 { "name": "Canon de 37 mle 16 TR",
  "type": "INF",
  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
  "note_number": "8\u2020<sup>1</sup>",
  "notes": [ "A", "C\u2020" ],
-  "_id_": "fr/o:007",
-  "_gpid_": 1632
+  "id": "fr/o:007",
+  "gpid": 1632
 },
 { "name": "Canon de 65 M mle 06",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
  "note_number": "9\u2020",
  "notes": [ "A", "P" ],
-  "_id_": "fr/o:008",
-  "_gpid_": 1674
+  "id": "fr/o:008",
+  "gpid": 1674
 },
 { "name": "Canon de 75 M mle 28",
  "type": "ART",
@ -82,8 +82,8 @@
  "capabilities2": { "s": 6, "AP": 5 },
  "note_number": "10\u2020",
  "notes": [ "A", "P" ],
-  "_id_": "fr/o:009",
-  "_gpid_": 1678
+  "id": "fr/o:009",
+  "gpid": 1678
 },
 { "name": "Canon de 75 mle 1897",
  "type": "ART",
@ -91,86 +91,86 @@
  "capabilities2": { "s": 8 },
  "note_number": "11\u2020",
  "notes": [ "B", "P" ],
-  "_id_": "fr/o:010",
-  "_gpid_": [ 1679, 1704 ]
+  "id": "fr/o:010",
+  "gpid": [ 1679, 1704 ]
 },
 { "name": "Canon de 105 M mle 28",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "note_number": "12\u2020",
  "notes": [ "A", "P" ],
-  "_id_": "fr/o:011",
-  "_gpid_": 1680
+  "id": "fr/o:011",
+  "gpid": 1680
 },
 { "name": "Canon de 105 C mle 35 B",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "13",
  "notes": [ "E", "F\u2020" ],
-  "_id_": "fr/o:012",
-  "_gpid_": 1681
+  "id": "fr/o:012",
+  "gpid": 1681
 },
 { "name": "Canon de 105 L mle 13 S",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "14\u2020",
  "notes": [ "P" ],
-  "_id_": "fr/o:013",
-  "_gpid_": 1682
+  "id": "fr/o:013",
+  "gpid": 1682
 },
 { "name": "Canon de 105 L mle 36 S",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "15",
  "notes": [ "E", "F\u2020" ],
-  "_id_": "fr/o:014",
-  "_gpid_": 1683
+  "id": "fr/o:014",
+  "gpid": 1683
 },
 { "name": "Canon de 155 C mle 17 S",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 8 },
  "note_number": "16\u2020",
-  "_id_": "fr/o:015",
-  "_gpid_": 1684
+  "id": "fr/o:015",
+  "gpid": 1684
 },
 { "name": "Canon de 155 GPF",
  "type": "ART",
  "capabilities": [ "NT", "RFNM", "no IF" ],
  "note_number": "17\u2020",
-  "_id_": "fr/o:016",
-  "_gpid_": 1685
+  "id": "fr/o:016",
+  "gpid": 1685
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
  "type": "AA",
  "capabilities": [ "T", "2 TK DR\u2020<sup>1</sup>", "Towing NA\u2020<sup>1</sup>" ],
  "note_number": "18\u2020<sup>1</sup>",
  "notes": [ "B", "G\u2020", "V" ],
-  "_id_": "fr/o:017",
-  "_gpid_": [ 1687, 1688, 1689 ]
+  "id": "fr/o:017",
+  "gpid": [ 1687, 1688, 1689 ]
 },
 { "name": "Mitrailleuse de 20 CA mle 39 O",
  "type": "AA",
  "capabilities": [ "T" ],
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF", "B11" ] },
  "note_number": "19\u2020",
-  "_id_": "fr/o:018",
-  "_gpid_": 1690
+  "id": "fr/o:018",
+  "gpid": 1690
 },
 { "name": "Canon Automatique de 25 CA mle 38",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "20\u2020<sup>1</sup>",
  "notes": [ "G\u2020" ],
-  "_id_": "fr/o:019",
-  "_gpid_": [ 1691, 1692 ]
+  "id": "fr/o:019",
+  "gpid": [ 1691, 1692 ]
 },
 { "name": "Canon de 75 CA mle 32",
  "type": "AA",
  "capabilities": [ "T", "NM" ],
  "note_number": "21\u2020",
-  "_id_": "fr/o:020",
-  "_gpid_": 1693
+  "id": "fr/o:020",
+  "gpid": 1693
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/german.json
+++ b/vasl_templates/webapp/data/ordnance/german.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "5PP" ],
  "note_number": "1",
  "notes": [ "N" ],
-  "_id_": "ge/o:000",
-  "_gpid_": 2465
+  "id": "ge/o:000",
+  "gpid": 2465
 },
 { "name": "8cm GrW 34",
  "type": "MTR",
@ -14,8 +14,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "2\u2020",
  "notes": [ "N" ],
-  "_id_": "ge/o:001",
-  "_gpid_": 2488
+  "id": "ge/o:001",
+  "gpid": 2488
 },
 { "name": "10cm NbW 35",
  "type": "MTR",
@ -23,16 +23,16 @@
  "capabilities2": { "s": 10 },
  "note_number": "3",
  "notes": [ "O" ],
-  "_id_": "ge/o:002",
-  "_gpid_": 2490
+  "id": "ge/o:002",
+  "gpid": 2490
 },
 { "name": "12cm GrW 42",
  "type": "MTR",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "s": 8 },
  "note_number": "4\u2020",
-  "_id_": "ge/o:003",
-  "_gpid_": 2491
+  "id": "ge/o:003",
+  "gpid": 2491
 },
 { "name": "2.8cm sPzB 41",
  "type": "AT",
@ -40,8 +40,8 @@
  "capabilities_other": [ "uses APCR TK Table\u2020" ],
  "note_number": "5\u2020",
  "notes": [ "A\u2020", "N", "P" ],
-  "_id_": "ge/o:004",
-  "_gpid_": 2493
+  "id": "ge/o:004",
+  "gpid": 2493
 },
 { "name": "3.7cm PaK 35/36",
  "type": "AT",
@ -49,8 +49,8 @@
  "capabilities2": { "A": [ [4,1], [5,2], [4,3], [3,4] ], "H": "6[9]\u2020" },
  "note_number": "6",
  "notes": [ "B\u2020", "N", "P" ],
-  "_id_": "ge/o:005",
-  "_gpid_": 2494
+  "id": "ge/o:005",
+  "gpid": 2494
 },
 { "name": "4.2cm lePaK 41",
  "type": "AT",
@ -58,8 +58,8 @@
  "capabilities_other": [ "uses APCR TK Table\u2020" ],
  "note_number": "7",
  "notes": [ "A\u2020", "N<sup>T</sup>" ],
-  "_id_": "ge/o:006",
-  "_gpid_": 2495
+  "id": "ge/o:006",
+  "gpid": 2495
 },
 { "name": "5cm PaK 38",
  "type": "AT",
@ -67,8 +67,8 @@
  "capabilities2": { "A": [ [5,1], [6,2], [5,3], [4,4] ] },
  "note_number": "8\u2020",
  "notes": [ "N" ],
-  "_id_": "ge/o:007",
-  "_gpid_": 2496
+  "id": "ge/o:007",
+  "gpid": 2496
 },
 { "name": "7.5cm PaK 97/38",
  "type": "AT",
@ -76,8 +76,8 @@
  "capabilities2": { "H": 6, "s": 7 },
  "note_number": "9",
  "notes": [ "N<sup>T</sup>" ],
-  "_id_": "ge/o:008",
-  "_gpid_": 2497
+  "id": "ge/o:008",
+  "gpid": 2497
 },
 { "name": "7.5cm PaK 40",
  "type": "AT",
@ -85,8 +85,8 @@
  "capabilities2": { "A": [ [5,2], [4,3], [3,4] ], "s": 7 },
  "note_number": "10\u2020",
  "notes": [ "N<sup>T</sup>" ],
-  "_id_": "ge/o:009",
-  "_gpid_": 2498
+  "id": "ge/o:009",
+  "gpid": 2498
 },
 { "name": "7.62cm PaK 36r",
  "type": "AT",
@ -94,8 +94,8 @@
  "capabilities2": { "A": [ [5,2], [4,3], [3,4] ], "s": 6 },
  "note_number": "11\u2020",
  "notes": [ "N" ],
-  "_id_": "ge/o:010",
-  "_gpid_": 2499
+  "id": "ge/o:010",
+  "gpid": 2499
 },
 { "name": "8.8cm PaK 43",
  "type": "AT",
@ -103,22 +103,22 @@
  "capabilities2": { "LF": [ "88\u2020", "1 ROF", "B11", "<b>M4</b>", "-1" ] },
  "note_number": "12",
  "notes": [ "C\u2020" ],
-  "_id_": "ge/o:011",
-  "_gpid_": 2500
+  "id": "ge/o:011",
+  "gpid": 2500
 },
 { "name": "8.8cm PaK 43/41",
  "type": "AT",
  "capabilities": [ "NT" ],
  "note_number": "13",
-  "_id_": "ge/o:012",
-  "_gpid_": 2501
+  "id": "ge/o:012",
+  "gpid": 2501
 },
 { "name": "12.8cm K 81/1",
  "type": "AT",
  "capabilities": [ "NT", "NM" ],
  "note_number": "14",
-  "_id_": "ge/o:013",
-  "_gpid_": 2502
+  "id": "ge/o:013",
+  "gpid": 2502
 },
 { "name": "7.5cm leIG 18",
  "type": "INF",
@ -126,8 +126,8 @@
  "capabilities2": { "H": 7 },
  "note_number": "15",
  "notes": [ "N", "O" ],
-  "_id_": "ge/o:014",
-  "_gpid_": 2504
+  "id": "ge/o:014",
+  "gpid": 2504
 },
 { "name": "15cm sIG 33",
  "type": "INF",
@ -135,8 +135,8 @@
  "capabilities2": { "H": 7, "s": 8 },
  "note_number": "16",
  "notes": [ "N" ],
-  "_id_": "ge/o:015",
-  "_gpid_": 2505
+  "id": "ge/o:015",
+  "gpid": 2505
 },
 { "name": "7.5cm LG 40",
  "type": "RCL",
@ -144,8 +144,8 @@
  "capabilities2": { "H": 6 },
  "note_number": "17",
  "notes": [ "N<sup>T</sup>" ],
-  "_id_": "ge/o:016",
-  "_gpid_": 2506
+  "id": "ge/o:016",
+  "gpid": 2506
 },
 { "name": "10.5cm LG 42",
  "type": "RCL",
@ -153,16 +153,16 @@
  "capabilities2": { "H": 6, "s": 6 },
  "note_number": "18\u2020",
  "notes": [ "N<sup>T</sup>" ],
-  "_id_": "ge/o:017",
-  "_gpid_": 2507
+  "id": "ge/o:017",
+  "gpid": 2507
 },
 { "name": "7.5cm leFK 16nA",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "H": 5, "s": 8 },
  "note_number": "19",
-  "_id_": "ge/o:018",
-  "_gpid_": 2509
+  "id": "ge/o:018",
+  "gpid": 2509
 },
 { "name": "10.5cm leFH 18",
  "type": "ART",
@ -170,8 +170,8 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "20",
  "notes": [ "N" ],
-  "_id_": "ge/o:019",
-  "_gpid_": 2510
+  "id": "ge/o:019",
+  "gpid": 2510
 },
 { "name": "s 10cm K 18",
  "type": "ART",
@ -179,8 +179,8 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "21",
  "notes": [ "N" ],
-  "_id_": "ge/o:020",
-  "_gpid_": 2511
+  "id": "ge/o:020",
+  "gpid": 2511
 },
 { "name": "15cm sFH 18",
  "type": "ART",
@ -188,8 +188,8 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "22",
  "notes": [ "N" ],
-  "_id_": "ge/o:021",
-  "_gpid_": 2512
+  "id": "ge/o:021",
+  "gpid": 2512
 },
 { "name": "15cm K 18",
  "type": "ART",
@ -197,8 +197,8 @@
  "capabilities2": { "AP": 6 },
  "note_number": "23",
  "notes": [ "N<sup>T</sup>" ],
-  "_id_": "ge/o:022",
-  "_gpid_": 2513
+  "id": "ge/o:022",
+  "gpid": 2513
 },
 { "name": "17cm K 18",
  "type": "ART",
@ -206,8 +206,8 @@
  "capabilities2": { "AP": 6 },
  "note_number": "24",
  "notes": [ "N" ],
-  "_id_": "ge/o:023",
-  "_gpid_": 2514
+  "id": "ge/o:023",
+  "gpid": 2514
 },
 { "name": "2cm FlaK 30",
  "type": "AA",
@ -215,8 +215,8 @@
  "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B10", "NT" ] },
  "note_number": "25",
  "notes": [ "C\u2020", "N" ],
-  "_id_": "ge/o:024",
-  "_gpid_": 2516
+  "id": "ge/o:024",
+  "gpid": 2516
 },
 { "name": "2cm FlaK 38",
  "type": "AA",
@ -224,8 +224,8 @@
  "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B11", "NT" ] },
  "note_number": "26",
  "notes": [ "C\u2020", "N" ],
-  "_id_": "ge/o:025",
-  "_gpid_": 2517
+  "id": "ge/o:025",
+  "gpid": 2517
 },
 { "name": "2cm FlaKvierling 38",
  "type": "AA",
@ -233,8 +233,8 @@
  "capabilities_other": [ "4TK DR\u2020" ],
  "note_number": "27\u2020",
  "notes": [ "N" ],
-  "_id_": "ge/o:026",
-  "_gpid_": 2518
+  "id": "ge/o:026",
+  "gpid": 2518
 },
 { "name": "3.7cm FlaK 36 o. 37",
  "type": "AA",
@ -242,15 +242,15 @@
  "capabilities2": { "H": "5[9]\u2020" },
  "note_number": "28",
  "notes": [ "B\u2020", "N" ],
-  "_id_": "ge/o:027",
-  "_gpid_": 2519
+  "id": "ge/o:027",
+  "gpid": 2519
 },
 { "name": "3.7cm FlaK 43",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "29",
-  "_id_": "ge/o:028",
-  "_gpid_": 2520
+  "id": "ge/o:028",
+  "gpid": 2520
 },
 { "name": "8.8cm FlaK 18 o. 36",
  "type": "AA",
@ -258,8 +258,8 @@
  "capabilities2": { "A": [ [5,2], [4,3], [3,4] ], "LF": [ "88L\u2020", "1 ROF", "B11" ] },
  "note_number": "30",
  "notes": [ "C\u2020", "N" ],
-  "_id_": "ge/o:029",
-  "_gpid_": 2521
+  "id": "ge/o:029",
+  "gpid": 2521
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/italian.json
+++ b/vasl_templates/webapp/data/ordnance/italian.json
@ -5,8 +5,8 @@
  "capabilities_other": [ "4PP" ],
  "note_number": "1",
  "notes": [ "N" ],
-  "_id_": "it/o:000",
-  "_gpid_": 3422
+  "id": "it/o:000",
+  "gpid": 3422
 },
 { "name": "Mortaio da 81/14",
  "type": "MTR",
@ -14,24 +14,24 @@
  "capabilities2": { "s": 8 },
  "note_number": "2\u2020",
  "notes": [ "N" ],
-  "_id_": "it/o:001",
-  "_gpid_": 3442
+  "id": "it/o:001",
+  "gpid": 3442
 },
 { "name": "Fucile-cc S",
  "type": "ATR",
  "capabilities_other": [ "5PP" ],
  "note_number": "3",
  "notes": [ "N" ],
-  "_id_": "it/o:002",
-  "_gpid_": 3428
+  "id": "it/o:002",
+  "gpid": 3428
 },
 { "name": "Cannone-cc da 37/45",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "4\u2020",
  "notes": [ "C", "N", "<s>R</s>" ],
-  "_id_": "it/o:003",
-  "_gpid_": 3444
+  "id": "it/o:003",
+  "gpid": 3444
 },
 { "name": "Cannone da 47/32",
  "type": "AT",
@ -39,8 +39,8 @@
  "capabilities2": { "Towed": [ [null,"A1+"], "\u2020" ] },
  "note_number": "5\u2020",
  "notes": [ "A", "C", "N" ],
-  "_id_": "it/o:004",
-  "_gpid_": 3445
+  "id": "it/o:004",
+  "gpid": 3445
 },
 { "name": "Cannone da 65/17",
  "type": "INF",
@ -48,24 +48,24 @@
  "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "6\u2020",
  "notes": [ "A", "C", "H\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/o:005",
-  "_gpid_": 3446
+  "id": "it/o:005",
+  "gpid": 3446
 },
 { "name": "Cannone da 70/15",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "Acq. NA\u2020<sup>1</sup>", "no Gunshield", "h-d" ],
  "note_number": "7\u2020",
  "notes": [ "A", "B\u2020<sup>1</sup>", "<s>R</s>" ],
-  "_id_": "it/o:006",
-  "_gpid_": 3447
+  "id": "it/o:006",
+  "gpid": 3447
 },
 { "name": "Obice da 75/13",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "8\u2020",
  "notes": [ "A" ],
-  "_id_": "it/o:007",
-  "_gpid_": 3451
+  "id": "it/o:007",
+  "gpid": 3451
 },
 { "name": "Cannone da 75/27",
  "type": "ART",
@ -73,8 +73,8 @@
  "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "9\u2020",
  "notes": [ "A", "C", "H\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/o:008",
-  "_gpid_": 3452
+  "id": "it/o:008",
+  "gpid": 3452
 },
 { "name": "Obice da 75/18",
  "type": "ART",
@ -82,8 +82,8 @@
  "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ], "s": 8 },
  "note_number": "10\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/o:009",
-  "_gpid_": 3453
+  "id": "it/o:009",
+  "gpid": 3453
 },
 { "name": "Cannone da 75/32",
  "type": "ART",
@ -91,8 +91,8 @@
  "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ], "s": 8 },
  "note_number": "11\u2020",
  "notes": [ "H\u2020<sup>1</sup>" ],
-  "_id_": "it/o:010",
-  "_gpid_": 3454
+  "id": "it/o:010",
+  "gpid": 3454
 },
 { "name": "Obice da 100/17",
  "type": "ART",
@ -100,8 +100,8 @@
  "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "12\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/o:011",
-  "_gpid_": 3455
+  "id": "it/o:011",
+  "gpid": 3455
 },
 { "name": "Cannone da 105/28",
  "type": "ART",
@ -109,16 +109,16 @@
  "capabilities2": { "s": 8 },
  "note_number": "13\u2020",
  "notes": [ "N" ],
-  "_id_": "it/o:012",
-  "_gpid_": 3456
+  "id": "it/o:012",
+  "gpid": 3456
 },
 { "name": "Obice 149/13",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "14\u2020",
  "notes": [ "N" ],
-  "_id_": "it/o:013",
-  "_gpid_": 3457
+  "id": "it/o:013",
+  "gpid": 3457
 },
 { "name": "Cannone da 149/35",
  "type": "ART",
@ -126,16 +126,16 @@
  "capabilities2": { "s": 8 },
  "note_number": "15\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "N", "<s>R</s>" ],
-  "_id_": "it/o:014",
-  "_gpid_": 3458
+  "id": "it/o:014",
+  "gpid": 3458
 },
 { "name": "Cannone da 149/40",
  "type": "ART",
  "capabilities": [ "NT", "RFNM" ],
  "note_number": "16\u2020",
  "notes": [ "N" ],
-  "_id_": "it/o:015",
-  "_gpid_": 3459
+  "id": "it/o:015",
+  "gpid": 3459
 },
 { "name": "Cannone-mitragliera da 20/65",
  "type": "AA",
@ -143,32 +143,32 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF" ] },
  "note_number": "17\u2020",
  "notes": [ "A", "C", "N" ],
-  "_id_": "it/o:016",
-  "_gpid_": 3461
+  "id": "it/o:016",
+  "gpid": 3461
 },
 { "name": "Cannone-aa da 75/39",
  "type": "AA",
  "capabilities": [ "T" ],
  "capabilities_other": [ "\"16\" AP TK#\u2020" ],
  "note_number": "18\u2020",
-  "_id_": "it/o:017",
-  "_gpid_": 3462
+  "id": "it/o:017",
+  "gpid": 3462
 },
 { "name": "Cannone-aa da 75/46",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "19\u2020",
  "notes": [ "N" ],
-  "_id_": "it/o:018",
-  "_gpid_": 3463
+  "id": "it/o:018",
+  "gpid": 3463
 },
 { "name": "Cannone-aa da 90/53",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "20\u2020",
  "notes": [ "N", "<s>R</s>" ],
-  "_id_": "it/o:019",
-  "_gpid_": 3464
+  "id": "it/o:019",
+  "gpid": 3464
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/japanese.json
+++ b/vasl_templates/webapp/data/ordnance/japanese.json
@ -6,8 +6,8 @@
  "capabilities2": { "WP": "6\u2020" },
  "capabilities_other": [ "4PP", "s7\u2020" ],
  "note_number": "1\u2020",
-  "_id_": "ja/o:000",
-  "_gpid_": 3253
+  "id": "ja/o:000",
+  "gpid": 3253
 },
 { "name": "Year-11 Type Curved-Fire Infantry Gun",
  "type": "MTR",
@ -15,8 +15,8 @@
  "capabilities2": { "WP": 5 },
  "note_number": "2\u2020",
  "notes": [ "A", "B\u2020<sup>1</sup>" ],
-  "_id_": "ja/o:001",
-  "_gpid_": 3277
+  "id": "ja/o:001",
+  "gpid": 3277
 },
 { "name": "Type 97 Curved-Fire Infantry Gun",
  "type": "MTR",
@ -24,8 +24,8 @@
  "capabilities2": { "WP": 5 },
  "note_number": "3\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:002",
-  "_gpid_": 3279
+  "id": "ja/o:002",
+  "gpid": 3279
 },
 { "name": "Type 97 Light Close-Attack Gun",
  "type": "MTR",
@ -33,47 +33,47 @@
  "capabilities2": { "WP": 5 },
  "note_number": "4\u2020",
  "notes": [ "A", "B\u2020<sup>1</sup>" ],
-  "_id_": "ja/o:003",
-  "_gpid_": 3281
+  "id": "ja/o:003",
+  "gpid": 3281
 },
 { "name": "Type 97 Medium Close-Attack Gun",
  "type": "MTR",
  "capabilities": [ "NT", "Towing NA\u2020<sup>1</sup>" ],
  "note_number": "5\u2020",
  "notes": [ "A", "C\u2020<sup>1</sup>" ],
-  "_id_": "ja/o:004",
-  "_gpid_": 3283
+  "id": "ja/o:004",
+  "gpid": 3283
 },
 { "name": "Type 97 Automatic Gun",
  "type": "ATR",
  "capabilities_other": [ "5PP", "crew\u2020" ],
  "note_number": "6\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:005",
-  "_gpid_": 3263
+  "id": "ja/o:005",
+  "gpid": 3263
 },
 { "name": "Type 94 Rapid-Fire Gun",
  "type": "AT",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "7\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:006",
-  "_gpid_": 3285
+  "id": "ja/o:006",
+  "gpid": 3285
 },
 { "name": "Type 1 Machine-Moved Gun",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "8\u2020",
-  "_id_": "ja/o:007",
-  "_gpid_": 3286
+  "id": "ja/o:007",
+  "gpid": 3286
 },
 { "name": "Year-11 Type Flat-Trajectory Infantry Gun",
  "type": "INF",
  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
  "note_number": "9\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:008",
-  "_gpid_": 3252
+  "id": "ja/o:008",
+  "gpid": 3252
 },
 { "name": "Type 92 Infantry Gun",
  "type": "INF",
@ -81,8 +81,8 @@
  "capabilities2": { "AP": 5, "WP": 5, "H": [ [6,5] ] },
  "note_number": "10\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:009",
-  "_gpid_": 3287
+  "id": "ja/o:009",
+  "gpid": 3287
 },
 { "name": "Year-41 Type Mountain Gun",
  "type": "INF",
@ -90,8 +90,8 @@
  "capabilities2": { "WP": 7, "H": [ [6,"4+"], "\u2020" ] },
  "note_number": "11\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:010",
-  "_gpid_": 3288
+  "id": "ja/o:010",
+  "gpid": 3288
 },
 { "name": "Year-38 Type Field Gun (Improved)",
  "type": "ART",
@ -99,39 +99,39 @@
  "capabilities2": { "WP": 6 },
  "capabilities_other": [ "\"12\" AP TK#\u2020" ],
  "note_number": "12\u2020",
-  "_id_": "ja/o:011",
-  "_gpid_": 3291
+  "id": "ja/o:011",
+  "gpid": 3291
 },
 { "name": "Type 90 Field Gun",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "WP": 6 },
  "note_number": "13\u2020",
-  "_id_": "ja/o:012",
-  "_gpid_": 3292
+  "id": "ja/o:012",
+  "gpid": 3292
 },
 { "name": "Type 91 10cm Field Howitzer",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "14\u2020",
-  "_id_": "ja/o:013",
-  "_gpid_": 3293
+  "id": "ja/o:013",
+  "gpid": 3293
 },
 { "name": "Type 92 10cm Cannon",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "AP": 5, "WP": 5 },
  "note_number": "15\u2020",
-  "_id_": "ja/o:014",
-  "_gpid_": 3294
+  "id": "ja/o:014",
+  "gpid": 3294
 },
 { "name": "Year-38 Type 12cm Howitzer",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "capabilities2": { "AP": 5 },
  "note_number": "16\u2020",
-  "_id_": "ja/o:015",
-  "_gpid_": 3295
+  "id": "ja/o:015",
+  "gpid": 3295
 },
 { "name": "Year-3 Type 14cm Naval Seacoast Gun",
  "type": "ART",
@ -139,8 +139,8 @@
  "capabilities_other": [ "NM\u2020" ],
  "note_number": "17\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:016",
-  "_gpid_": 3296
+  "id": "ja/o:016",
+  "gpid": 3296
 },
 { "name": "Year-4 Type 15cm Howitzer",
  "type": "ART",
@ -148,8 +148,8 @@
  "capabilities2": { "AP": 5, "WP": 5 },
  "capabilities_other": [ "Towing risk\u2020" ],
  "note_number": "18\u2020",
-  "_id_": "ja/o:017",
-  "_gpid_": 3297
+  "id": "ja/o:017",
+  "gpid": 3297
 },
 { "name": "Type 96 15cm Howitzer",
  "type": "ART",
@ -157,16 +157,16 @@
  "capabilities2": { "AP": 5, "WP": 5 },
  "note_number": "19\u2020",
  "notes": [ "E" ],
-  "_id_": "ja/o:018",
-  "_gpid_": 3298
+  "id": "ja/o:018",
+  "gpid": 3298
 },
 { "name": "Type 93 Twin-Mount High-Angle Machine Gun",
  "type": "AA",
  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
  "note_number": "20\u2020",
  "notes": [ "A", "C\u2020<sup>1</sup>", "E" ],
-  "_id_": "ja/o:019",
-  "_gpid_": 3301
+  "id": "ja/o:019",
+  "gpid": 3301
 },
 { "name": "Type 98 High-Angle Machine Cannon",
  "type": "AA",
@ -174,8 +174,8 @@
  "capabilities2": { "LF": [ "NT", "20\u2020", "2 ROF" ] },
  "note_number": "21\u2020",
  "notes": [ "A" ],
-  "_id_": "ja/o:020",
-  "_gpid_": 3302
+  "id": "ja/o:020",
+  "gpid": 3302
 },
 { "name": "Type 96 Naval High-Angle Machine Cannon",
  "type": "AA",
@ -183,32 +183,32 @@
  "capabilities_other": [ "NM\u2020" ],
  "note_number": "22\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:021",
-  "_gpid_": 3303
+  "id": "ja/o:021",
+  "gpid": 3303
 },
 { "name": "Type 96 Twin-Mount Naval High-Angle Machine Cannon",
  "type": "AA",
  "capabilities": [ "T", "NM\u2020", "2 TK DR\u2020<sup>1</sup>" ],
  "note_number": "22\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:022",
-  "_gpid_": 3304
+  "id": "ja/o:022",
+  "gpid": 3304
 },
 { "name": "Type 96 Triple-Mount Naval High-Angle Machine Cannon",
  "type": "AA",
  "capabilities": [ "T", "NM\u2020", "3 TK DR\u2020<sup>1</sup>" ],
  "note_number": "22\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:023",
-  "_gpid_": 3305
+  "id": "ja/o:023",
+  "gpid": 3305
 },
 { "name": "Type 88 7.5cm Mobile Field High-Angle Gun",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "23\u2020",
  "notes": [ "E" ],
-  "_id_": "ja/o:024",
-  "_gpid_": 3306
+  "id": "ja/o:024",
+  "gpid": 3306
 },
 { "name": "Year-10 Type 12cm Naval High-Angle Gun",
  "type": "AA",
@ -216,16 +216,16 @@
  "capabilities_other": [ "NM\u2020" ],
  "note_number": "24\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:025",
-  "_gpid_": 3308
+  "id": "ja/o:025",
+  "gpid": 3308
 },
 { "name": "Type 10 8cm Naval High-Angle Gun",
  "type": "AA",
  "capabilities": [ "T", "NM\u2020", "\"13\" AP TK\u2020<sup>1</sup>" ],
  "note_number": "25\u2020<sup>1</sup>",
  "notes": [ "D\u2020", "E" ],
-  "_id_": "ja/o:026",
-  "_gpid_": 3307
+  "id": "ja/o:026",
+  "gpid": 3307
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/russian.json
+++ b/vasl_templates/webapp/data/ordnance/russian.json
@ -4,24 +4,24 @@
  "type": "MTR",
  "capabilities_other": [ "4PP" ],
  "note_number": "1",
-  "_id_": "ru/o:000",
-  "_gpid_": 485
+  "id": "ru/o:000",
+  "gpid": 485
 },
 { "name": "37mm PM-39",
  "type": "MTR",
  "capabilities_other": [ "1PP", "Air Bursts & Acq. NA" ],
  "note_number": "1.1",
  "notes": [ "A" ],
-  "_id_": "ru/o:001",
-  "_gpid_": 6996
+  "id": "ru/o:001",
+  "gpid": 6996
 },
 { "name": "82mm BM obr. 37",
  "type": "MTR",
  "capabilities": [ "NT", "QSU", "IR" ],
  "capabilities2": { "s": 8 },
  "note_number": "2\u2020",
-  "_id_": "ru/o:002",
-  "_gpid_": 508
+  "id": "ru/o:002",
+  "gpid": 508
 },
 { "name": "107mm GVPM obr. 38",
  "type": "MTR",
@ -29,68 +29,68 @@
  "capabilities2": { "s": 8 },
  "note_number": "3",
  "notes": [ "A" ],
-  "_id_": "ru/o:003",
-  "_gpid_": 510
+  "id": "ru/o:003",
+  "gpid": 510
 },
 { "name": "120mm PM obr. 38",
  "type": "MTR",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "s": 8 },
  "note_number": "4",
-  "_id_": "ru/o:004",
-  "_gpid_": 511
+  "id": "ru/o:004",
+  "gpid": 511
 },
 { "name": "160mm PM obr. 43",
  "type": "MTR",
  "capabilities": [ "NT", "no IF" ],
  "note_number": "5",
-  "_id_": "ru/o:005",
-  "_gpid_": 512
+  "id": "ru/o:005",
+  "gpid": 512
 },
 { "name": "37mm PTP obr. 30",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "note_number": "6",
-  "_id_": "ru/o:006",
-  "_gpid_": 514
+  "id": "ru/o:006",
+  "gpid": 514
 },
 { "name": "45mm PTP obr. 32",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [4,2], [5,3], [6,4], [7,5] ] },
  "note_number": "7",
-  "_id_": "ru/o:007",
-  "_gpid_": 515
+  "id": "ru/o:007",
+  "gpid": 515
 },
 { "name": "45mm PTP obr. 42",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [4,2], [5,3], [6,4], [7,5] ] },
  "note_number": "8",
-  "_id_": "ru/o:008",
-  "_gpid_": 516
+  "id": "ru/o:008",
+  "gpid": 516
 },
 { "name": "57mm PTP obr. 43",
  "type": "AT",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [4,3], [5,4], [6,5] ] },
  "note_number": "9\u2020",
-  "_id_": "ru/o:009",
-  "_gpid_": 517
+  "id": "ru/o:009",
+  "gpid": 517
 },
 { "name": "100mm PTP obr. 44",
  "type": "AT",
  "capabilities": [ "NT" ],
  "note_number": "10",
-  "_id_": "ru/o:010",
-  "_gpid_": 518
+  "id": "ru/o:010",
+  "gpid": 518
 },
 { "name": "37mm PP obr. 15R",
  "type": "INF",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "note_number": "11",
-  "_id_": "ru/o:011",
-  "_gpid_": 520
+  "id": "ru/o:011",
+  "gpid": 520
 },
 { "name": "76.2mm PP obr. 27",
  "type": "INF",
@ -98,129 +98,129 @@
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "12",
  "notes": [ "A" ],
-  "_id_": "ru/o:012",
-  "_gpid_": 521
+  "id": "ru/o:012",
+  "gpid": 521
 },
 { "name": "76.2mm P obr. 00/02P",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "s": 8 },
  "note_number": "13",
-  "_id_": "ru/o:013",
-  "_gpid_": 523
+  "id": "ru/o:013",
+  "gpid": 523
 },
 { "name": "76.2mm P obr. 02/30",
  "type": "ART",
  "capabilities": [ "NT", "QSU", "h-d" ],
  "capabilities2": { "s": 8 },
  "note_number": "14",
-  "_id_": "ru/o:014",
-  "_gpid_": 524
+  "id": "ru/o:014",
+  "gpid": 524
 },
 { "name": "76.2mm P obr. 39",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [4,2], [5,3], [6,4], [7,5] ], "s": 8 },
  "note_number": "15\u2020",
-  "_id_": "ru/o:015",
-  "_gpid_": 525
+  "id": "ru/o:015",
+  "gpid": 525
 },
 { "name": "76.2mm P obr. 36",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [4,2] ], "s": 8 },
  "note_number": "16\u2020",
-  "_id_": "ru/o:016",
-  "_gpid_": 526
+  "id": "ru/o:016",
+  "gpid": 526
 },
 { "name": "85mm P obr. 44",
  "type": "ART",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "A": [ [5,4], [6,5] ], "s": 8 },
  "note_number": "17",
-  "_id_": "ru/o:017",
-  "_gpid_": 527
+  "id": "ru/o:017",
+  "gpid": 527
 },
 { "name": "107mm P obr. 10/30",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "capabilities2": { "s": 8 },
  "note_number": "18",
-  "_id_": "ru/o:018",
-  "_gpid_": 528
+  "id": "ru/o:018",
+  "gpid": 528
 },
 { "name": "122mm G obr. 10/30",
  "type": "ART",
  "capabilities": [ "NT", "h-d" ],
  "capabilities2": { "s": 8 },
  "note_number": "19",
-  "_id_": "ru/o:019",
-  "_gpid_": 529
+  "id": "ru/o:019",
+  "gpid": 529
 },
 { "name": "122mm G obr. 38",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "H": 6, "s": 8 },
  "note_number": "20",
-  "_id_": "ru/o:020",
-  "_gpid_": 530
+  "id": "ru/o:020",
+  "gpid": 530
 },
 { "name": "122mm P obr. 31",
  "type": "ART",
  "capabilities": [ "NT" ],
  "capabilities2": { "s": 8 },
  "note_number": "21",
-  "_id_": "ru/o:021",
-  "_gpid_": 531
+  "id": "ru/o:021",
+  "gpid": 531
 },
 { "name": "152mm G obr. 38",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "22",
-  "_id_": "ru/o:022",
-  "_gpid_": 532
+  "id": "ru/o:022",
+  "gpid": 532
 },
 { "name": "152mm GP obr. 37",
  "type": "ART",
  "capabilities": [ "NT" ],
  "note_number": "23",
-  "_id_": "ru/o:023",
-  "_gpid_": 533
+  "id": "ru/o:023",
+  "gpid": 533
 },
 { "name": "203mm B-4 obr. 1931",
  "type": "ART",
  "capabilities": [ "NT", "RFNM", "no IF" ],
  "note_number": "23.1",
-  "_id_": "ru/o:024",
-  "_gpid_": 6995
+  "id": "ru/o:024",
+  "gpid": 6995
 },
 { "name": "25mm ZP obr. 40",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "24",
-  "_id_": "ru/o:025",
-  "_gpid_": 536
+  "id": "ru/o:025",
+  "gpid": 536
 },
 { "name": "37mm ZP obr. 39",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "25\u2020",
-  "_id_": "ru/o:026",
-  "_gpid_": 537
+  "id": "ru/o:026",
+  "gpid": 537
 },
 { "name": "76.2mm ZP obr. 38",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "26\u2020",
-  "_id_": "ru/o:027",
-  "_gpid_": 538
+  "id": "ru/o:027",
+  "gpid": 538
 },
 { "name": "85mm ZP obr. 39",
  "type": "AA",
  "capabilities": [ "T" ],
  "note_number": "27",
-  "_id_": "ru/o:028",
-  "_gpid_": 539
+  "id": "ru/o:028",
+  "gpid": 539
 }

 ]
--- a/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json
@ -0,0 +1,70 @@
+[
+
+{ "name": "OML 2-in. Mortar",
+  "type": "MTR",
+  "capabilities": [ "IR" ],
+  "capabilities2": { "s": 7 },
+  "capabilities_other": [ "4PP" ],
+  "note_number": "14",
+  "notes": [ "A", "N" ],
+  "id": "bcfk/o:000",
+  "gpid": null
+},
+{ "name": "M19 60mm Mortar",
+  "type": "MTR",
+  "capabilities": [ "IR" ],
+  "capabilities2": { "WP": 6 },
+  "capabilities_other": [ "4PP" ],
+  "note_number": "15",
+  "notes": [ "A", "R" ],
+  "id": "bcfk/o:001",
+  "gpid": null
+},
+{ "name": "OML 3-in. Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU", "IR" ],
+  "capabilities2": { "s": 8, "WP": 7 },
+  "note_number": "16",
+  "notes": [ "A" ],
+  "id": "bcfk/o:002",
+  "gpid": null
+},
+{ "name": "OSB 4.2-in. Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 8, "WP": 7 },
+  "capabilities_other": [ "Towed\u2020" ],
+  "note_number": "17\u2020",
+  "notes": [ "N" ],
+  "id": "bcfk/o:003",
+  "gpid": null
+},
+{ "name": "OQF 17-Pounder",
+  "type": "AT",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "HE": 8, "D": 6 },
+  "note_number": "18",
+  "notes": [ "N" ],
+  "id": "bcfk/o:004",
+  "gpid": null
+},
+{ "name": "OQF 25-Pounder",
+  "type": "ART",
+  "capabilities2": { "LF": [ "NT", "0 ROF" ], "s": 8 },
+  "capabilities_other": [ "ST" ],
+  "note_number": "19\u2020",
+  "notes": [ "N" ],
+  "id": "bcfk/o:005",
+  "gpid": null
+},
+{ "name": "OQF 40mm AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "40\u2020", "2 ROF" ] },
+  "note_number": "20",
+  "notes": [ "B\u2020", "N" ],
+  "id": "bcfk/o:006",
+  "gpid": null
+}
+
+]
--- a/vasl_templates/webapp/data/ordnance/un-forces/common.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/common.json
@ -0,0 +1,50 @@
+[
+
+{ "name": "M9A1 Rocket Launcher",
+  "type": null,
+  "capabilities2": { "WP": 6 },
+  "capabilities_other": [ "1PP" ],
+  "note_number": "21",
+  "notes": [ "K", "R", "Y" ],
+  "id": "unc/o:000",
+  "gpid": null
+},
+{ "name": "M20 Rocket Launcher",
+  "type": null,
+  "capabilities2": { "WP": [ [6,"2+"], "\u2020" ] },
+  "capabilities_other": [ "1PP" ],
+  "note_number": "22\u2020",
+  "notes": [ "K", "M", "O", "P", "R" ],
+  "id": "unc/o:001",
+  "gpid": null
+},
+{ "name": "M2 60mm Mortar",
+  "type": "MTR",
+  "capabilities": [ "IR" ],
+  "capabilities2": { "WP": 7 },
+  "capabilities_other": [ "5PP", "OBA\u2020" ],
+  "note_number": "23\u2020",
+  "notes": [ "A", "K", "M", "O", "P", "Y" ],
+  "id": "unc/o:002",
+  "gpid": null
+},
+{ "name": "M1(L) 81mm Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU", "IR" ],
+  "capabilities2": { "WP": 8 },
+  "note_number": "24\u2020",
+  "notes": [ "A", "K", "M", "O", "P", "R" ],
+  "id": "unc/o:003",
+  "gpid": null
+},
+{ "name": "M20(L) 75mm Recoilless Rifle",
+  "type": "RCL",
+  "capabilities2": { "WP": 7 },
+  "capabilities_other": [ "5PP", "H\u2020", "crewed\u2020" ],
+  "note_number": "25\u2020",
+  "notes": [ "K", "M", "O", "P", "R" ],
+  "id": "unc/o:004",
+  "gpid": null
+}
+
+]
--- a/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
@ -0,0 +1,120 @@
+[
+
+{ "name": "Type 89 Heavy Grenade Launcher",
+  "type": "MTR",
+  "capabilities_other": [ "4PP" ],
+  "note_number": "1\u2020",
+  "notes": [ "A", "P" ],
+  "id": "uro/o:000",
+  "gpid": null
+},
+{ "name": "M2 4.2-in. Mortar",
+  "type": "MTR",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "WP": 10 },
+  "note_number": "2\u2020",
+  "notes": [ "K", "M", "O", "P", "Y" ],
+  "id": "uro/o:001",
+  "gpid": null
+},
+{ "name": "M3A1 37mm AT Gun",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "C": 7 },
+  "note_number": "3\u2020",
+  "notes": [ "C", "K", "P" ],
+  "id": "uro/o:002",
+  "gpid": null
+},
+{ "name": "M1 57mm AT Gun",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "HE": 7, "D": 4 },
+  "note_number": "4\u2020",
+  "notes": [ "K" ],
+  "id": "uro/o:003",
+  "gpid": null
+},
+{ "name": "M18(L) 57mm Recoilless Rifle",
+  "type": "RCL",
+  "capabilities2": { "H": 7, "WP": 6, "C": 7 },
+  "capabilities_other": [ "3PP", "non-crewed\u2020" ],
+  "note_number": "5\u2020",
+  "notes": [ "C", "K", "O" ],
+  "id": "uro/o:004",
+  "gpid": null
+},
+{ "name": "M2A1 105mm Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "H": 6, "s": 7, "WP": 8, "C": 7 },
+  "note_number": "6\u2020",
+  "notes": [ "C", "K", "M", "O", "P", "Y" ],
+  "id": "uro/o:005",
+  "gpid": null
+},
+{ "name": "M3 105mm Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "H": 7, "s": 7, "WP": 8, "C": 7 },
+  "note_number": "7\u2020",
+  "notes": [ "C", "K" ],
+  "id": "uro/o:006",
+  "gpid": null
+},
+{ "name": "M1 155mm Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 7, "WP": 8 },
+  "note_number": "8\u2020",
+  "notes": [ "K", "M", "P", "Y" ],
+  "id": "uro/o:007",
+  "gpid": null
+},
+{ "name": "M1A1 155mm Gun",
+  "type": "ART",
+  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities2": { "AP": 4, "s": 7, "WP": 8 },
+  "note_number": "9",
+  "notes": [ "Y" ],
+  "id": "uro/o:008",
+  "gpid": null
+},
+{ "name": "M1 8-in. Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "note_number": "10\u2020",
+  "notes": [ "Y" ],
+  "id": "uro/o:009",
+  "gpid": null
+},
+{ "name": "M51 Multiple .50-cal MG Carriage",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "2 ROF", "20 IFE", "B11" ] },
+  "capabilities_other": [ "4 TK DR\u2020" ],
+  "note_number": "11\u2020",
+  "notes": [ "M", "Y" ],
+  "id": "uro/o:010",
+  "gpid": null
+},
+{ "name": "M1 40mm AA Gun",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "40\u2020", "2 ROF" ] },
+  "note_number": "12",
+  "notes": [ "B\u2020", "Y" ],
+  "id": "uro/o:011",
+  "gpid": null
+},
+{ "name": "M2 90mm AA Gun",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "90\u2020<sup>1</sup>", "1 ROF", "B11" ] },
+  "note_number": "13\u2020",
+  "notes": [ "B\u2020<sup>1</sup>", "M", "Y" ],
+  "id": "uro/o:012",
+  "gpid": null
+}
+
+]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/belgian.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/belgian.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "14\u2020",
  "notes": [ "A", "Q\u2020<sup>1</sup>" ],
-  "_id_": "be/v:000",
-  "_gpid_": 2292
+  "id": "be/v:000",
+  "gpid": 2292
 },
 { "name": "T-13 II(b)",
  "type": "TD",
@ -15,8 +15,8 @@
  "CS#": "4:brewup\u2020",
  "note_number": "15\u2020",
  "notes": [ "A" ],
-  "_id_": "be/v:001",
-  "_gpid_": 2294
+  "id": "be/v:001",
+  "gpid": 2294
 },
 { "name": "T-13 III(b)",
  "type": "TD",
@ -24,8 +24,8 @@
  "CS#": "4:brewup",
  "note_number": "16",
  "notes": [ "A" ],
-  "_id_": "be/v:002",
-  "_gpid_": 2296
+  "id": "be/v:002",
+  "gpid": 2296
 },
 { "name": "T-15(b)",
  "type": "LT",
@ -33,8 +33,8 @@
  "CS#": 2,
  "note_number": "17",
  "notes": [ "A" ],
-  "_id_": "be/v:003",
-  "_gpid_": 2298
+  "id": "be/v:003",
+  "gpid": 2298
 },
 { "name": "ACG1(f)",
  "type": "LT",
@ -42,8 +42,8 @@
  "CS#": "3:brewup",
  "note_number": "18\u2020",
  "notes": [ "A" ],
-  "_id_": "be/v:004",
-  "_gpid_": 2300
+  "id": "be/v:004",
+  "gpid": 2300
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/common.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/common.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "31",
  "notes": [ "A" ],
-  "_id_": "alc/v:000",
-  "_gpid_": [ 2231, 2329 ]
+  "id": "alc/v:000",
+  "gpid": [ 2231, 2329 ]
 },
 { "name": "L3/35(i)",
  "type": "Tt",
@ -15,24 +15,24 @@
  "CS#": 2,
  "note_number": "31\u2020",
  "notes": [ "A", "D" ],
-  "_id_": "alc/v:001",
-  "_gpid_": [ 2233, 2331 ]
+  "id": "alc/v:001",
+  "gpid": [ 2233, 2331 ]
 },
 { "name": "L6/40(i)",
  "type": "LT",
  "CS#": 2,
  "note_number": "31\u2020",
  "notes": [ "A" ],
-  "_id_": "alc/v:002",
-  "_gpid_": [ 2235, 2333 ]
+  "id": "alc/v:002",
+  "gpid": [ 2235, 2333 ]
 },
 { "name": "M13/40(i)",
  "type": "MT",
  "CS#": 4,
  "note_number": "31\u2020",
  "notes": [ "A" ],
-  "_id_": "alc/v:003",
-  "_gpid_": [ 2237, 2335 ]
+  "id": "alc/v:003",
+  "gpid": [ 2237, 2335 ]
 },
 { "name": "FT-17M(f)",
  "type": "Tt",
@ -40,8 +40,8 @@
  "CS#": 2,
  "note_number": "32\u2020",
  "notes": [ "A", "F" ],
-  "_id_": "alc/v:004",
-  "_gpid_": 2239
+  "id": "alc/v:004",
+  "gpid": 2239
 },
 { "name": "FT-17C(f)",
  "type": "Tt",
@ -51,8 +51,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "32\u2020",
  "notes": [ "A", "F" ],
-  "_id_": "alc/v:005",
-  "_gpid_": 2241
+  "id": "alc/v:005",
+  "gpid": 2241
 },
 { "name": "R-35(f)",
  "type": "LT",
@ -61,61 +61,61 @@
  "capabilities2": { "AP": 10 },
  "note_number": "33\u2020",
  "notes": [ "A", "E\u2020<sup>1</sup>", "F" ],
-  "_id_": "alc/v:006",
-  "_gpid_": 2243
+  "id": "alc/v:006",
+  "gpid": 2243
 },
 { "name": "M3A1(a)",
  "type": "SC",
  "CS#": 4,
  "note_number": "34\u2020",
  "notes": [ "A", "V" ],
-  "_id_": "alc/v:007",
-  "_gpid_": 2245
+  "id": "alc/v:007",
+  "gpid": 2245
 },
 { "name": "C-K P17(f)",
  "type": "ht",
  "cs#": 4,
  "note_number": "35",
  "notes": [ "A" ],
-  "_id_": "alc/v:008",
-  "_gpid_": 2247
+  "id": "alc/v:008",
+  "gpid": 2247
 },
 { "name": "C-K P19(f)",
  "type": "ht",
  "cs#": 5,
  "note_number": "35\u2020",
  "notes": [ "A" ],
-  "_id_": "alc/v:009",
-  "_gpid_": 2249
+  "id": "alc/v:009",
+  "gpid": 2249
 },
 { "name": "VCL Utility B(b)",
  "type": "APC",
  "cs#": 2,
  "note_number": "36\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>", "V" ],
-  "_id_": "alc/v:010",
-  "_gpid_": 2251
+  "id": "alc/v:010",
+  "gpid": 2251
 },
 { "name": "Light Truck",
  "type": "tr",
  "cs#": 4,
  "note_number": "37",
-  "_id_": "alc/v:011",
-  "_gpid_": 2253
+  "id": "alc/v:011",
+  "gpid": 2253
 },
 { "name": "Medium Truck",
  "type": "tr",
  "cs#": 5,
  "note_number": "37",
-  "_id_": "alc/v:012",
-  "_gpid_": 2255
+  "id": "alc/v:012",
+  "gpid": 2255
 },
 { "name": "Heavy Truck",
  "type": "tr",
  "cs#": 7,
  "note_number": "37",
-  "_id_": "alc/v:013",
-  "_gpid_": 2257
+  "id": "alc/v:013",
+  "gpid": 2257
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/danish.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/danish.json
@ -5,8 +5,8 @@
  "CS#": [ null, "\u2020" ],
  "capabilities": [ "M8\u2020" ],
  "note_number": "24\u2020",
-  "_id_": "da/v:000",
-  "_gpid_": 2314
+  "id": "da/v:000",
+  "gpid": 2314
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/dutch.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/dutch.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "25\u2020",
  "notes": [ "A", "V" ],
-  "_id_": "du/v:000",
-  "_gpid_": 2315
+  "id": "du/v:000",
+  "gpid": 2315
 },
 { "name": "CTLS-4(a)",
  "type": "Tt",
@ -15,8 +15,8 @@
  "CS#": 2,
  "note_number": "26\u2020",
  "notes": [ "A", "V" ],
-  "_id_": "du/v:001",
-  "_gpid_": 2317
+  "id": "du/v:001",
+  "gpid": 2317
 },
 { "name": "M36",
  "type": "AC",
@ -25,8 +25,8 @@
  "capabilities2": { "HE": 10 },
  "note_number": "27",
  "notes": [ "<s>V</s>" ],
-  "_id_": "du/v:002",
-  "_gpid_": 2319
+  "id": "du/v:002",
+  "gpid": 2319
 },
 { "name": "M38",
  "type": "AC",
@ -35,8 +35,8 @@
  "capabilities2": { "HE": 10 },
  "note_number": "27",
  "notes": [ "<s>V</s>" ],
-  "_id_": "du/v:003",
-  "_gpid_": 2321
+  "id": "du/v:003",
+  "gpid": 2321
 },
 { "name": "M39",
  "type": "AC",
@ -45,8 +45,8 @@
  "capabilities2": { "HE": 10 },
  "note_number": "28",
  "notes": [ "<s>V</s>" ],
-  "_id_": "du/v:004",
-  "_gpid_": 2323
+  "id": "du/v:004",
+  "gpid": 2323
 },
 { "name": "Marmon-Herrington III(b)",
  "type": "AC",
@ -54,16 +54,16 @@
  "CS#": 4,
  "note_number": "29\u2020",
  "notes": [ "A", "V" ],
-  "_id_": "du/v:005",
-  "_gpid_": 2325
+  "id": "du/v:005",
+  "gpid": 2325
 },
 { "name": "Jeep(a)",
  "type": "tr",
  "cs#": "2\u2020",
  "note_number": "30\u2020",
  "notes": [ "A", "V" ],
-  "_id_": "du/v:006",
-  "_gpid_": [ 2327, 2328 ]
+  "id": "du/v:006",
+  "gpid": [ 2327, 2328 ]
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/polish.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/polish.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "D" ],
-  "_id_": "po/v:000",
-  "_gpid_": 2259
+  "id": "po/v:000",
+  "gpid": 2259
 },
 { "name": "TKS(L)",
  "type": "Tt",
@ -15,8 +15,8 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "D" ],
-  "_id_": "po/v:001",
-  "_gpid_": 2261
+  "id": "po/v:001",
+  "gpid": 2261
 },
 { "name": "Vickers Edw(b)",
  "type": "LT",
@ -24,8 +24,8 @@
  "CS#": 3,
  "note_number": "2\u2020",
  "notes": [ "A", "K\u2020<sup>1</sup>" ],
-  "_id_": "po/v:002",
-  "_gpid_": 2263
+  "id": "po/v:002",
+  "gpid": 2263
 },
 { "name": "Vickers Ejw(b)",
  "type": "LT",
@ -33,8 +33,8 @@
  "CS#": 3,
  "note_number": "2",
  "notes": [ "A" ],
-  "_id_": "po/v:003",
-  "_gpid_": 2265
+  "id": "po/v:003",
+  "gpid": 2265
 },
 { "name": "7TPdw",
  "type": "LT",
@ -42,15 +42,15 @@
  "CS#": 3,
  "note_number": "3\u2020",
  "notes": [ "K\u2020<sup>1</sup>" ],
-  "_id_": "po/v:004",
-  "_gpid_": 2267
+  "id": "po/v:004",
+  "gpid": 2267
 },
 { "name": "7TPjw",
  "type": "LT",
  "CS#": 3,
  "note_number": "3",
-  "_id_": "po/v:005",
-  "_gpid_": 2269
+  "id": "po/v:005",
+  "gpid": 2269
 },
 { "name": "H35(f)",
  "type": "LT",
@ -59,8 +59,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "4",
  "notes": [ "A", "E\u2020", "F" ],
-  "_id_": "po/v:006",
-  "_gpid_": 2271
+  "id": "po/v:006",
+  "gpid": 2271
 },
 { "name": "Peugeot 1918(f)",
  "type": "AC",
@ -68,77 +68,77 @@
  "CS#": 4,
  "note_number": "5",
  "notes": [ "A", "D", "G\u2020" ],
-  "_id_": "po/v:007",
-  "_gpid_": 2273
+  "id": "po/v:007",
+  "gpid": 2273
 },
 { "name": "wz.29 \"Ursus\"",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 5,
  "note_number": "6\u2020",
-  "_id_": "po/v:008",
-  "_gpid_": 2275
+  "id": "po/v:008",
+  "gpid": 2275
 },
 { "name": "wz.34-I",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "7",
-  "_id_": "po/v:009",
-  "_gpid_": 2277
+  "id": "po/v:009",
+  "gpid": 2277
 },
 { "name": "wz.34-II",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "7",
-  "_id_": "po/v:010",
-  "_gpid_": 2279
+  "id": "po/v:010",
+  "gpid": 2279
 },
 { "name": "De Dion-Bouton(f)",
  "type": "AAtr",
  "CS#": 7,
  "note_number": "8\u2020",
  "notes": [ "A", "Q\u2020<sup>1</sup>", "AA\u2020<sup>2</sup>" ],
-  "_id_": "po/v:011",
-  "_gpid_": 2281
+  "id": "po/v:011",
+  "gpid": 2281
 },
 { "name": "PF 621L SPAA",
  "type": "AAtr",
  "CS#": 5,
  "note_number": "9\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "Q\u2020<sup>2</sup>", "AA\u2020<sup>3</sup>" ],
-  "_id_": "po/v:012",
-  "_gpid_": 2283
+  "id": "po/v:012",
+  "gpid": 2283
 },
 { "name": "302T",
  "type": "AAtr",
  "CS#": 3,
  "note_number": "10\u2020",
-  "_id_": "po/v:013",
-  "_gpid_": 2285
+  "id": "po/v:013",
+  "gpid": 2285
 },
 { "name": "C2P",
  "type": "APC",
  "cs#": 4,
  "note_number": "11",
-  "_id_": "po/v:014",
-  "_gpid_": 2287
+  "id": "po/v:014",
+  "gpid": 2287
 },
 { "name": "C4P",
  "type": "ht",
  "cs#": 5,
  "note_number": "12",
-  "_id_": "po/v:015",
-  "_gpid_": 2289
+  "id": "po/v:015",
+  "gpid": 2289
 },
 { "name": "\"Taczanka\"",
  "type": "AAh-d",
  "cs#": 3,
  "note_number": "13\u2020",
  "notes": [ "Q\u2020<sup>1</sup>" ],
-  "_id_": "po/v:016",
-  "_gpid_": 2291
+  "id": "po/v:016",
+  "gpid": 2291
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/allied-minor/yugoslavian.json
+++ b/vasl_templates/webapp/data/vehicles/allied-minor/yugoslavian.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "19",
  "notes": [ "D" ],
-  "_id_": "yu/v:000",
-  "_gpid_": 2302
+  "id": "yu/v:000",
+  "gpid": 2302
 },
 { "name": "M3A1(a)",
  "type": "LT",
@ -15,8 +15,8 @@
  "capabilities2": { "C": "3\u2020" },
  "note_number": "20\u2020",
  "notes": [ "A", "B", "C", "L" ],
-  "_id_": "yu/v:001",
-  "_gpid_": 2304
+  "id": "yu/v:001",
+  "gpid": 2304
 },
 { "name": "M3A3(a)",
  "type": "LT",
@ -24,24 +24,24 @@
  "capabilities2": { "C": "3\u2020", "sD": 3 },
  "note_number": "20\u2020",
  "notes": [ "A", "B", "C", "L" ],
-  "_id_": "yu/v:002",
-  "_gpid_": 2306
+  "id": "yu/v:002",
+  "gpid": 2306
 },
 { "name": "M3(a) PaK 40",
  "type": "TD",
  "CS#": 2,
  "note_number": "21\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>", "L" ],
-  "_id_": "yu/v:003",
-  "_gpid_": 2308
+  "id": "yu/v:003",
+  "gpid": 2308
 },
 { "name": "M3(a) FlaK 38",
  "type": "SPAA",
  "CS#": 2,
  "note_number": "22\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>", "L", "AA\u2020<sup>2</sup>" ],
-  "_id_": "yu/v:004",
-  "_gpid_": 2310
+  "id": "yu/v:004",
+  "gpid": 2310
 },
 { "name": "AEC II(b)",
  "type": "AC",
@ -49,8 +49,8 @@
  "capabilities2": { "HE": 5, "D": 4, "sM": 8 },
  "note_number": "23",
  "notes": [ "A", "G\u2020", "L" ],
-  "_id_": "yu/v:005",
-  "_gpid_": 2312
+  "id": "yu/v:005",
+  "gpid": 2312
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/american.json
+++ b/vasl_templates/webapp/data/vehicles/american.json
@ -6,8 +6,8 @@
  "capabilities2": { "C": [ [10,"P"], "\u2020<sup>1</sup>" ] },
  "note_number": "1",
  "notes": [ "B\u2020", "C\u2020<sup>1</sup>", "P" ],
-  "_id_": "am/v:000",
-  "_gpid_": 907
+  "id": "am/v:000",
+  "gpid": 907
 },
 { "name": "M3",
  "type": "LT",
@ -15,8 +15,8 @@
  "capabilities2": { "C": [ [7,"A2+"], "\u2020<sup>2</sup>" ] },
  "note_number": "2\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>", "N" ],
-  "_id_": "am/v:001",
-  "_gpid_": 909
+  "id": "am/v:001",
+  "gpid": 909
 },
 { "name": "M3A1",
  "type": "LT",
@ -24,16 +24,16 @@
  "capabilities": [ "C7\u2020<sup>2</sup>" ],
  "note_number": "3\u2020",
  "notes": [ "C\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G", "N" ],
-  "_id_": "am/v:002",
-  "_gpid_": 5723
+  "id": "am/v:002",
+  "gpid": 5723
 },
 { "name": "M3A1 Satan",
  "type": "LTv",
  "CS#": 4,
  "note_number": "4",
  "notes": [ "P" ],
-  "_id_": "am/v:003",
-  "_gpid_": 913
+  "id": "am/v:003",
+  "gpid": 913
 },
 { "name": "M5A1",
  "type": "LT",
@ -41,8 +41,8 @@
  "capabilities": [ "C7\u2020<sup>2</sup>" ],
  "note_number": "5\u2020",
  "notes": [ "C\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G", "N", "Y" ],
-  "_id_": "am/v:004",
-  "_gpid_": 5728
+  "id": "am/v:004",
+  "gpid": 5728
 },
 { "name": "M24",
  "type": "LT",
@ -50,8 +50,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
  "note_number": "6\u2020",
  "notes": [ "G", "<s>P</s>", "R\u2020<sup>1</sup>" ],
-  "_id_": "am/v:005",
-  "_gpid_": 917
+  "id": "am/v:005",
+  "gpid": 917
 },
 { "name": "M3",
  "type": "MT",
@ -59,8 +59,8 @@
  "capabilities": [ "C5\u2020<sup>2</sup>" ],
  "note_number": "7\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>", "G", "N" ],
-  "_id_": "am/v:006",
-  "_gpid_": 919
+  "id": "am/v:006",
+  "gpid": 919
 },
 { "name": "M4",
  "type": "MT",
@ -68,8 +68,8 @@
  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
  "note_number": "8\u2020",
  "notes": [ "F\u2020<sup>2</sup>", "G", "R\u2020<sup>1</sup>", "Y", "BB\u2020<sup>3</sup>" ],
-  "_id_": "am/v:007",
-  "_gpid_": 5733
+  "id": "am/v:007",
+  "gpid": 5733
 },
 { "name": "M4A1",
  "type": "MT",
@ -77,8 +77,8 @@
  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
  "note_number": "9\u2020",
  "notes": [ "F\u2020<sup>2</sup>", "G", "N", "R\u2020<sup>1</sup>", "Y", "BB\u2020<sup>3</sup>" ],
-  "_id_": "am/v:008",
-  "_gpid_": 5738
+  "id": "am/v:008",
+  "gpid": 5738
 },
 { "name": "M4A2",
  "type": "MT",
@ -86,8 +86,8 @@
  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>2</sup>" ], "sM": [ [5,"4+"] ] },
  "note_number": "10",
  "notes": [ "F\u2020<sup>1</sup>", "G", "P", "R\u2020", "BB\u2020<sup>2</sup>" ],
-  "_id_": "am/v:009",
-  "_gpid_": 5743
+  "id": "am/v:009",
+  "gpid": 5743
 },
 { "name": "M4A2 (L)",
  "type": "MT",
@ -95,8 +95,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
  "note_number": "11",
  "notes": [ "F\u2020<sup>1</sup>", "G", "P", "R\u2020" ],
-  "_id_": "am/v:010",
-  "_gpid_": 5748
+  "id": "am/v:010",
+  "gpid": 5748
 },
 { "name": "M4A3",
  "type": "MT",
@ -104,8 +104,8 @@
  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [4,"4+"] ] },
  "note_number": "12\u2020",
  "notes": [ "F\u2020<sup>2</sup>", "G", "R\u2020<sup>1</sup>", "Y", "BB\u2020<sup>3</sup>" ],
-  "_id_": "am/v:011",
-  "_gpid_": 5753
+  "id": "am/v:011",
+  "gpid": 5753
 },
 { "name": "M4A3(75)W",
  "type": "MT",
@ -113,8 +113,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
  "note_number": "13\u2020",
  "notes": [ "F\u2020<sup>2</sup>", "G", "R\u2020<sup>1</sup>", "Y" ],
-  "_id_": "am/v:012",
-  "_gpid_": 5758
+  "id": "am/v:012",
+  "gpid": 5758
 },
 { "name": "M4A3E2",
  "type": "MT",
@ -122,8 +122,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
  "note_number": "14",
  "notes": [ "F\u2020<sup>1</sup>", "G", "<s>P</s>", "R\u2020" ],
-  "_id_": "am/v:013",
-  "_gpid_": 5763
+  "id": "am/v:013",
+  "gpid": 5763
 },
 { "name": "M4A3E2 (L)",
  "type": "MT",
@ -131,8 +131,8 @@
  "capabilities2": { "A": [ [4,4], [5,5] ], "s": [ [5,5] ], "sM": 8 },
  "note_number": "14\u2020",
  "notes": [ "F\u2020<sup>1</sup>", "G", "<s>P</s>" ],
-  "_id_": "am/v:014",
-  "_gpid_": 5768
+  "id": "am/v:014",
+  "gpid": 5768
 },
 { "name": "M4A1(76)W",
  "type": "MT",
@ -140,8 +140,8 @@
  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
  "note_number": "15\u2020",
  "notes": [ "A\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G", "<s>P</s>", "Y" ],
-  "_id_": "am/v:015",
-  "_gpid_": 5773
+  "id": "am/v:015",
+  "gpid": 5773
 },
 { "name": "M4A3(76)W",
  "type": "MT",
@ -149,8 +149,8 @@
  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
  "note_number": "16\u2020",
  "notes": [ "A\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G", "<s>P</s>", "Y" ],
-  "_id_": "am/v:016",
-  "_gpid_": 5778
+  "id": "am/v:016",
+  "gpid": 5778
 },
 { "name": "M4(105)",
  "type": "MT",
@ -158,8 +158,8 @@
  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
  "note_number": "17\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "Y" ],
-  "_id_": "am/v:017",
-  "_gpid_": 941
+  "id": "am/v:017",
+  "gpid": 941
 },
 { "name": "M4A3(105)",
  "type": "MT",
@ -167,8 +167,8 @@
  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
  "note_number": "17\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "Y" ],
-  "_id_": "am/v:018",
-  "_gpid_": 943
+  "id": "am/v:018",
+  "gpid": 943
 },
 { "name": "M4 Tankdozer",
  "type": "MTv",
@ -176,8 +176,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 6 },
  "note_number": "18\u2020",
  "notes": [ "G", "R\u2020<sup>1</sup>" ],
-  "_id_": "am/v:019",
-  "_gpid_": 945
+  "id": "am/v:019",
+  "gpid": 945
 },
 { "name": "T1E3",
  "type": "MTv",
@ -185,8 +185,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 6 },
  "note_number": "19\u2020",
  "notes": [ "G", "<s>P</s>", "R\u2020<sup>1</sup>" ],
-  "_id_": "am/v:020",
-  "_gpid_": 947
+  "id": "am/v:020",
+  "gpid": 947
 },
 { "name": "Sherman Crab",
  "type": "MTv",
@ -194,8 +194,8 @@
  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>2</sup>" ], "sM": 4 },
  "note_number": "20\u2020",
  "notes": [ "G", "R\u2020<sup>1</sup>", "BB\u2020<sup>2</sup>" ],
-  "_id_": "am/v:021",
-  "_gpid_": 949
+  "id": "am/v:021",
+  "gpid": 949
 },
 { "name": "POA-CWS-H1",
  "type": "MTv",
@ -203,8 +203,8 @@
  "capabilities2": { "sM": 8 },
  "note_number": "21\u2020",
  "notes": [ "P" ],
-  "_id_": "am/v:022",
-  "_gpid_": 951
+  "id": "am/v:022",
+  "gpid": 951
 },
 { "name": "M26",
  "type": "HT",
@ -212,8 +212,8 @@
  "capabilities2": { "A": 7 },
  "note_number": "22\u2020",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/v:023",
-  "_gpid_": 955
+  "id": "am/v:023",
+  "gpid": 955
 },
 { "name": "M10 GMC",
  "type": "TD",
@ -221,8 +221,8 @@
  "capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
  "note_number": "23\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "N", "Y" ],
-  "_id_": "am/v:024",
-  "_gpid_": 957
+  "id": "am/v:024",
+  "gpid": 957
 },
 { "name": "M18 GMC",
  "type": "TD",
@ -230,8 +230,8 @@
  "capabilities2": { "A": [ [5,"4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
  "note_number": "24\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "am/v:025",
-  "_gpid_": 959
+  "id": "am/v:025",
+  "gpid": 959
 },
 { "name": "M36 GMC",
  "type": "TD",
@ -239,8 +239,8 @@
  "capabilities2": { "A": [ [5,5] ], "sP": 5 },
  "note_number": "25\u2020",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/v:026",
-  "_gpid_": 961
+  "id": "am/v:026",
+  "gpid": 961
 },
 { "name": "M36B1 GMC",
  "type": "TD",
@ -248,48 +248,48 @@
  "capabilities2": { "A": 5, "sP": 5 },
  "note_number": "26",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/v:027",
-  "_gpid_": 963
+  "id": "am/v:027",
+  "gpid": 963
 },
 { "name": "M2",
  "type": "ht",
  "CS#": 4,
  "note_number": "27\u2020<sup>1</sup>",
  "notes": [ "E\u2020", "H", "I\u2020", "N" ],
-  "_id_": "am/v:028",
-  "_gpid_": 965
+  "id": "am/v:028",
+  "gpid": 965
 },
 { "name": "M3",
  "type": "ht",
  "CS#": 5,
  "note_number": "28\u2020",
  "notes": [ "N" ],
-  "_id_": "am/v:029",
-  "_gpid_": 967
+  "id": "am/v:029",
+  "gpid": 967
 },
 { "name": "M3A1",
  "type": "ht",
  "CS#": 5,
  "note_number": "29\u2020<sup>1</sup>",
  "notes": [ "E\u2020", "H", "I\u2020", "Z" ],
-  "_id_": "am/v:030",
-  "_gpid_": 969
+  "id": "am/v:030",
+  "gpid": 969
 },
 { "name": "M3(MMG)",
  "type": "ht",
  "CS#": 5,
  "note_number": "30\u2020",
  "notes": [ "E\u2020", "H", "N", "<s>P</s>" ],
-  "_id_": "am/v:031",
-  "_gpid_": 971
+  "id": "am/v:031",
+  "gpid": 971
 },
 { "name": "M3(HMG)",
  "type": "ht",
  "CS#": 5,
  "note_number": "30\u2020",
  "notes": [ "E\u2020", "H", "N", "<s>P</s>" ],
-  "_id_": "am/v:032",
-  "_gpid_": 973
+  "id": "am/v:032",
+  "gpid": 973
 },
 { "name": "M4 MC",
  "type": "ht",
@ -297,8 +297,8 @@
  "capabilities2": { "WP": 8 },
  "note_number": "31\u2020",
  "notes": [ "J\u2020", "M\u2020<sup>1</sup>", "N", "O\u2020<sup>2</sup>", "<s>P</s>" ],
-  "_id_": "am/v:033",
-  "_gpid_": 975
+  "id": "am/v:033",
+  "gpid": 975
 },
 { "name": "M4A1 MC",
  "type": "ht",
@ -306,8 +306,8 @@
  "capabilities2": { "WP": 8 },
  "note_number": "32\u2020",
  "notes": [ "J\u2020<sup>1</sup>", "M\u2020<sup>2</sup>", "O\u2020<sup>3</sup>" ],
-  "_id_": "am/v:034",
-  "_gpid_": 977
+  "id": "am/v:034",
+  "gpid": 977
 },
 { "name": "M21 MC",
  "type": "ht",
@ -315,16 +315,16 @@
  "capabilities2": { "WP": 8 },
  "note_number": "33",
  "notes": [ "M", "O\u2020", "<s>P</s>" ],
-  "_id_": "am/v:035",
-  "_gpid_": 979
+  "id": "am/v:035",
+  "gpid": 979
 },
 { "name": "M3 GMC",
  "type": "TDht",
  "CS#": 4,
  "note_number": "34\u2020",
  "notes": [ "N", "U" ],
-  "_id_": "am/v:036",
-  "_gpid_": [ 981, 983 ]
+  "id": "am/v:036",
+  "gpid": [ 981, 983 ]
 },
 { "name": "T30 HMC",
  "type": "ht",
@ -332,8 +332,8 @@
  "capabilities2": { "H": 5, "AP": 7, "WP": 9 },
  "note_number": "35\u2020<sup>1</sup>",
  "notes": [ "K\u2020", "N", "O\u2020", "<s>P</s>", "U" ],
-  "_id_": "am/v:037",
-  "_gpid_": 985
+  "id": "am/v:037",
+  "gpid": 985
 },
 { "name": "T19 HMC",
  "type": "ht",
@ -341,32 +341,32 @@
  "capabilities2": { "H": 5, "s": 7, "WP": 8 },
  "note_number": "36\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "N", "O\u2020<sup>1</sup>", "<s>P</s>" ],
-  "_id_": "am/v:038",
-  "_gpid_": 987
+  "id": "am/v:038",
+  "gpid": 987
 },
 { "name": "M15A1 MGMC",
  "type": "AAht",
  "CS#": 4,
  "note_number": "37\u2020",
  "notes": [ "N", "V\u2020", "AA\u2020<sup>1</sup>" ],
-  "_id_": "am/v:039",
-  "_gpid_": 990
+  "id": "am/v:039",
+  "gpid": 990
 },
 { "name": "M16 MGMC",
  "type": "AAht",
  "CS#": 4,
  "note_number": "38\u2020",
  "notes": [ "V\u2020", "AA\u2020<sup>1</sup>" ],
-  "_id_": "am/v:040",
-  "_gpid_": 992
+  "id": "am/v:040",
+  "gpid": 992
 },
 { "name": "M3A1",
  "type": "SC",
  "CS#": 4,
  "note_number": "39\u2020<sup>1</sup>",
  "notes": [ "E\u2020", "H", "I\u2020", "N" ],
-  "_id_": "am/v:041",
-  "_gpid_": 996
+  "id": "am/v:041",
+  "gpid": 996
 },
 { "name": "M20",
  "type": "SC",
@ -374,16 +374,16 @@
  "capabilities2": { "sP": 5 },
  "note_number": "40\u2020",
  "notes": [ "D\u2020<sup>3</sup>", "O\u2020<sup>2</sup>", "W\u2020<sup>1</sup>", "Z" ],
-  "_id_": "am/v:042",
-  "_gpid_": 998
+  "id": "am/v:042",
+  "gpid": 998
 },
 { "name": "T8",
  "type": "SC",
  "CS#": 5,
  "note_number": "41\u2020",
  "notes": [ "O\u2020<sup>1</sup>", "<s>P</s>" ],
-  "_id_": "am/v:043",
-  "_gpid_": 1000
+  "id": "am/v:043",
+  "gpid": 1000
 },
 { "name": "M8",
  "type": "AC",
@ -392,8 +392,8 @@
  "capabilities2": { "sP": 5 },
  "note_number": "42\u2020",
  "notes": [ "C\u2020<sup>2</sup>", "G", "W\u2020<sup>1</sup>" ],
-  "_id_": "am/v:044",
-  "_gpid_": 1002
+  "id": "am/v:044",
+  "gpid": 1002
 },
 { "name": "M8 HMC",
  "type": "SPA",
@ -401,8 +401,8 @@
  "capabilities2": { "H": 9, "C": [ [4,"4+"], "\u2020<sup>1</sup>" ], "WP": 9 },
  "note_number": "43\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "Y" ],
-  "_id_": "am/v:045",
-  "_gpid_": 1004
+  "id": "am/v:045",
+  "gpid": 1004
 },
 { "name": "M7 HMC",
  "type": "SPA",
@ -410,8 +410,8 @@
  "capabilities2": { "H": 7, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 8 },
  "note_number": "44\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/v:046",
-  "_gpid_": 1006
+  "id": "am/v:046",
+  "gpid": 1006
 },
 { "name": "M12 GMC",
  "type": "SPA",
@ -420,8 +420,8 @@
  "capabilities2": { "AP": 6, "WP": 8 },
  "note_number": "45\u2020",
  "notes": [ "<s>P</s>" ],
-  "_id_": "am/v:047",
-  "_gpid_": 1011
+  "id": "am/v:047",
+  "gpid": 1011
 },
 { "name": "LVT(A)1",
  "type": "aLT",
@ -429,8 +429,8 @@
  "capabilities2": { "C": [ [10,"P"], "\u2020<sup>2</sup>" ] },
  "note_number": "46\u2020<sup>1</sup>",
  "notes": [ "C\u2020<sup>2</sup>", "G", "H", "P", "T\u2020" ],
-  "_id_": "am/v:048",
-  "_gpid_": 1014
+  "id": "am/v:048",
+  "gpid": 1014
 },
 { "name": "LVT(A)4",
  "type": "aLT",
@ -438,8 +438,8 @@
  "capabilities2": { "H": 8, "C": [ [7,"P"], "\u2020<sup>3</sup>" ], "WP": 9 },
  "note_number": "47\u2020",
  "notes": [ "C\u2020<sup>3</sup>", "P", "T\u2020<sup>1</sup>", "X\u2020<sup>2</sup>" ],
-  "_id_": "am/v:049",
-  "_gpid_": [ 1016, 1018 ]
+  "id": "am/v:049",
+  "gpid": [ 1016, 1018 ]
 },
 { "name": "M4 DD",
  "type": "aMT",
@ -447,103 +447,103 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 5 },
  "note_number": "48",
  "notes": [ "G", "<s>P</s>", "R\u2020" ],
-  "_id_": "am/v:050",
-  "_gpid_": 1020
+  "id": "am/v:050",
+  "gpid": 1020
 },
 { "name": "LVT2",
  "type": "aPC",
  "CS#": 6,
  "note_number": "49\u2020",
  "notes": [ "D\u2020<sup>3</sup>", "H", "Q\u2020<sup>2</sup>", "T\u2020<sup>1</sup>" ],
-  "_id_": "am/v:051",
-  "_gpid_": 1022
+  "id": "am/v:051",
+  "gpid": 1022
 },
 { "name": "LVT2(m)",
  "type": "aAPC",
  "CS#": 7,
  "note_number": "49.1\u2020",
  "notes": [ "D\u2020<sup>3</sup>", "H", "P", "Q\u2020<sup>2</sup>", "T\u2020<sup>1</sup>" ],
-  "_id_": "am/v:052",
-  "_gpid_": 1024
+  "id": "am/v:052",
+  "gpid": 1024
 },
 { "name": "LVT(A)2",
  "type": "aAPC",
  "CS#": 7,
  "note_number": "50\u2020",
  "notes": [ "D\u2020<sup>3</sup>", "H", "Q\u2020<sup>2</sup>", "T\u2020<sup>1</sup>" ],
-  "_id_": "am/v:053",
-  "_gpid_": 1026
+  "id": "am/v:053",
+  "gpid": 1026
 },
 { "name": "LVT4",
  "type": "aAPC",
  "CS#": 7,
  "note_number": "51\u2020",
  "notes": [ "D", "H", "T\u2020<sup>1</sup>", "X\u2020<sup>2</sup>" ],
-  "_id_": "am/v:054",
-  "_gpid_": [ 1028, 1030 ]
+  "id": "am/v:054",
+  "gpid": [ 1028, 1030 ]
 },
 { "name": "M4 hst",
  "type": "PC",
  "CS#": 6,
  "note_number": "51.1\u2020",
-  "_id_": "am/v:055",
-  "_gpid_": 1050
+  "id": "am/v:055",
+  "gpid": 1050
 },
 { "name": "DUKW",
  "type": "atr",
  "cs#": "7\u2020<sup>1</sup>",
  "note_number": "52\u2020",
  "notes": [ "D\u2020<sup>3</sup>", "O\u2020<sup>2</sup>", "CC\u2020<sup>1</sup>" ],
-  "_id_": "am/v:056",
-  "_gpid_": 1032
+  "id": "am/v:056",
+  "gpid": 1032
 },
 { "name": "\u00bc-Ton Jeep GPA",
  "type": "atr",
  "cs#": 2,
  "note_number": "53\u2020",
  "notes": [ "L\u2020<sup>1</sup>" ],
-  "_id_": "am/v:057",
-  "_gpid_": 1036
+  "id": "am/v:057",
+  "gpid": 1036
 },
 { "name": "\u00bc-Ton Jeep",
  "type": "tr",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "54\u2020",
  "notes": [ "L\u2020<sup>2</sup>", "N", "O\u2020<sup>3</sup>", "CC\u2020<sup>1</sup>" ],
-  "_id_": "am/v:058",
-  "_gpid_": [ 1039, 1040, 1041 ]
+  "id": "am/v:058",
+  "gpid": [ 1039, 1040, 1041 ]
 },
 { "name": "\u00be-Ton",
  "type": "tr",
  "cs#": 4,
  "note_number": "55\u2020",
  "notes": [ "N" ],
-  "_id_": "am/v:059",
-  "_gpid_": 1042
+  "id": "am/v:059",
+  "gpid": 1042
 },
 { "name": "1\u00bd-Ton",
  "type": "tr",
  "cs#": 6,
  "note_number": "56\u2020",
  "notes": [ "N" ],
-  "_id_": "am/v:060",
-  "_gpid_": 1044
+  "id": "am/v:060",
+  "gpid": 1044
 },
 { "name": "2\u00bd-Ton",
  "type": "tr",
  "cs#": 7,
  "note_number": "57\u2020",
  "notes": [ "N" ],
-  "_id_": "am/v:061",
-  "_gpid_": 1046
+  "id": "am/v:061",
+  "gpid": 1046
 },
 { "name": "7\u00bd-Ton",
  "type": "tr",
  "cs#": 7,
  "note_number": "58\u2020",
  "notes": [ "N" ],
-  "_id_": "am/v:062",
-  "_gpid_": 1048
+  "id": "am/v:062",
+  "gpid": 1048
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/bulgarian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/bulgarian.json
@ -6,8 +6,8 @@
  "CS#": 3,
  "capabilities2": { "C": "5\u2020" },
  "note_number": "28\u2020",
-  "_id_": "bu/v:000",
-  "_gpid_": 3904
+  "id": "bu/v:000",
+  "gpid": 3904
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/common.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/common.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "29\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "E", "F", "G\u2020<sup>2</sup>", "H", "C", "B" ],
-  "_id_": "axc/v:000",
-  "_gpid_": 3787
+  "id": "axc/v:000",
+  "gpid": 3787
 },
 { "name": "FT-17M(f)",
  "type": "Tt",
@ -16,8 +16,8 @@
  "no_if": true,
  "note_number": "30\u2020",
  "notes": [ "D", "R", "C" ],
-  "_id_": "axc/v:001",
-  "_gpid_": 3789
+  "id": "axc/v:001",
+  "gpid": 3789
 },
 { "name": "FT-17C(f)",
  "type": "Tt",
@ -26,8 +26,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "30\u2020",
  "notes": [ "D", "R", "C" ],
-  "_id_": "axc/v:002",
-  "_gpid_": 3791
+  "id": "axc/v:002",
+  "gpid": 3791
 },
 { "name": "PzKpfw IB(g)",
  "type": "Tt",
@ -35,8 +35,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "31\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "E", "H", "C" ],
-  "_id_": "axc/v:003",
-  "_gpid_": 3827
+  "id": "axc/v:003",
+  "gpid": 3827
 },
 { "name": "R-35(f)",
  "type": "LT",
@ -45,8 +45,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "32\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "D", "E", "R", "H", "B" ],
-  "_id_": "axc/v:004",
-  "_gpid_": [ 3795, 3906 ]
+  "id": "axc/v:004",
+  "gpid": [ 3795, 3906 ]
 },
 { "name": "H39(f)",
  "type": "LT",
@ -55,8 +55,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "33\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "D", "E", "H", "C", "B" ],
-  "_id_": "axc/v:005",
-  "_gpid_": 3793
+  "id": "axc/v:005",
+  "gpid": 3793
 },
 { "name": "LT vz 35(g)",
  "type": "LT",
@ -64,8 +64,8 @@
  "capabilities2": { "sD": 5 },
  "note_number": "34\u2020",
  "notes": [ "E", "R", "S", "B" ],
-  "_id_": "axc/v:006",
-  "_gpid_": 3825
+  "id": "axc/v:006",
+  "gpid": 3825
 },
 { "name": "LT vz 38(t)A",
  "type": "LT",
@ -73,8 +73,8 @@
  "capabilities2": { "A": [ [3,1], [4,2], [3,3] ], "sD": 6 },
  "note_number": "35\u2020",
  "notes": [ "E", "R", "H", "S" ],
-  "_id_": "axc/v:007",
-  "_gpid_": 3799
+  "id": "axc/v:007",
+  "gpid": 3799
 },
 { "name": "LT vz 38(t)E",
  "type": "LT",
@ -82,16 +82,16 @@
  "capabilities2": { "A": [ [4,2], [3,3] ], "sD": 7 },
  "note_number": "35\u2020",
  "notes": [ "E", "H", "S", "B" ],
-  "_id_": "axc/v:008",
-  "_gpid_": 3801
+  "id": "axc/v:008",
+  "gpid": 3801
 },
 { "name": "S-35(f)",
  "type": "MT",
  "CS#": 4,
  "note_number": "36\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "D", "E", "H", "S" ],
-  "_id_": "axc/v:009",
-  "_gpid_": 3797
+  "id": "axc/v:009",
+  "gpid": 3797
 },
 { "name": "PzKpfw IIIL(g)",
  "type": "MT",
@ -99,8 +99,8 @@
  "capabilities2": { "A": [ [5,2], [4,3], [3,4] ], "sD": 5 },
  "note_number": "37\u2020",
  "notes": [ "E", "O\u2020<sup>1</sup>", "Q", "R", "H", "C" ],
-  "_id_": "axc/v:010",
-  "_gpid_": [ 3829, 3831 ]
+  "id": "axc/v:010",
+  "gpid": [ 3829, 3831 ]
 },
 { "name": "PzKpfw IIIN(g)",
  "type": "MT",
@ -108,8 +108,8 @@
  "capabilities2": { "H": [ [8,"3+"] ], "s": 8, "sD": 7 },
  "note_number": "38\u2020",
  "notes": [ "E", "O\u2020<sup>1</sup>", "Q", "R", "S" ],
-  "_id_": "axc/v:011",
-  "_gpid_": [ 3833, 3835 ]
+  "id": "axc/v:011",
+  "gpid": [ 3833, 3835 ]
 },
 { "name": "PzKpfw IVD(g)",
  "type": "MT",
@ -117,8 +117,8 @@
  "capabilities2": { "AP": 7, "H": [ [5,"3+"] ], "s": 8, "sD": 7 },
  "note_number": "39\u2020",
  "notes": [ "E", "Q", "R" ],
-  "_id_": "axc/v:012",
-  "_gpid_": 3837
+  "id": "axc/v:012",
+  "gpid": 3837
 },
 { "name": "PzKpfw IVF1(g)",
  "type": "MT",
@ -126,8 +126,8 @@
  "capabilities2": { "AP": 7, "H": [ [5,"3+"] ], "s": 8, "sD": 7 },
  "note_number": "39\u2020",
  "notes": [ "E", "Q", "R", "H", "B" ],
-  "_id_": "axc/v:013",
-  "_gpid_": 3839
+  "id": "axc/v:013",
+  "gpid": 3839
 },
 { "name": "PzKpfw IVH(g)",
  "type": "MT",
@ -135,8 +135,8 @@
  "capabilities2": { "A": [ [4,2], [3,3] ], "s": 7, "sD": 5 },
  "note_number": "39\u2020",
  "notes": [ "E", "O\u2020<sup>1</sup>", "Q", "R", "H", "B" ],
-  "_id_": "axc/v:014",
-  "_gpid_": [ 3841, 3843 ]
+  "id": "axc/v:014",
+  "gpid": [ 3841, 3843 ]
 },
 { "name": "StuG IIIG(g)",
  "type": "AG",
@ -144,8 +144,8 @@
  "capabilities2": { "A": [ [3,4] ], "s": 8, "sD": 7 },
  "note_number": "40\u2020",
  "notes": [ "E", "Q", "R", "H", "B" ],
-  "_id_": "axc/v:015",
-  "_gpid_": 3845
+  "id": "axc/v:015",
+  "gpid": 3845
 },
 { "name": "JgdPz 38(t)",
  "type": "TD",
@ -153,24 +153,24 @@
  "capabilities2": { "A": [ [3,4] ], "HE": 7 },
  "note_number": "41\u2020",
  "notes": [ "E", "H", "B" ],
-  "_id_": "axc/v:016",
-  "_gpid_": 3803
+  "id": "axc/v:016",
+  "gpid": 3803
 },
 { "name": "SPW 250/1(g)",
  "type": "ht",
  "CS#": 4,
  "note_number": "42\u2020",
  "notes": [ "E", "R" ],
-  "_id_": "axc/v:017",
-  "_gpid_": 3847
+  "id": "axc/v:017",
+  "gpid": 3847
 },
 { "name": "SPW 251/1(g)",
  "type": "ht",
  "CS#": 5,
  "note_number": "42\u2020",
  "notes": [ "E", "R", "C" ],
-  "_id_": "axc/v:018",
-  "_gpid_": 3849
+  "id": "axc/v:018",
+  "gpid": 3849
 },
 { "name": "SPW 251/9(g)",
  "type": "ht",
@ -178,8 +178,8 @@
  "capabilities2": { "H": 5, "s": 8 },
  "note_number": "42\u2020",
  "notes": [ "E", "R" ],
-  "_id_": "axc/v:019",
-  "_gpid_": 3851
+  "id": "axc/v:019",
+  "gpid": 3851
 },
 { "name": "OA vz 30(t)",
  "type": "AC",
@ -187,16 +187,16 @@
  "CS#": 2,
  "note_number": "43\u2020",
  "notes": [ "E", "R", "S" ],
-  "_id_": "axc/v:020",
-  "_gpid_": 3805
+  "id": "axc/v:020",
+  "gpid": 3805
 },
 { "name": "AB 41(i)",
  "type": "AC",
  "CS#": 4,
  "note_number": "44\u2020",
  "notes": [ "E", "R", "C" ],
-  "_id_": "axc/v:021",
-  "_gpid_": 3807
+  "id": "axc/v:021",
+  "gpid": 3807
 },
 { "name": "PSW 222(g)",
  "type": "AC",
@ -204,8 +204,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "45\u2020",
  "notes": [ "P\u2020<sup>1</sup>", "E", "M\u2020<sup>2</sup>", "R", "B" ],
-  "_id_": "axc/v:022",
-  "_gpid_": 3853
+  "id": "axc/v:022",
+  "gpid": 3853
 },
 { "name": "PSW 222(L)(g)",
  "type": "AC",
@ -213,8 +213,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "45\u2020",
  "notes": [ "P\u2020<sup>1</sup>", "E", "M\u2020<sup>2</sup>", "R", "B" ],
-  "_id_": "axc/v:023",
-  "_gpid_": 3855
+  "id": "axc/v:023",
+  "gpid": 3855
 },
 { "name": "PSW 223(g)",
  "type": "AC",
@ -222,72 +222,72 @@
  "capabilities2": { "sD": 6 },
  "note_number": "46\u2020",
  "notes": [ "E", "M\u2020<sup>1</sup>", "P\u2020<sup>2</sup>", "R", "B" ],
-  "_id_": "axc/v:024",
-  "_gpid_": 3857
+  "id": "axc/v:024",
+  "gpid": 3857
 },
 { "name": "Komsomolet(r)",
  "type": "APC",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "47\u2020",
  "notes": [ "E", "F", "I\u2020<sup>1</sup>", "J", "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:025",
-  "_gpid_": [ 3809, 3811 ]
+  "id": "axc/v:025",
+  "gpid": [ 3809, 3811 ]
 },
 { "name": "RSO(g)",
  "type": "PC",
  "cs#": 5,
  "note_number": "48",
  "notes": [ "S", "B" ],
-  "_id_": "axc/v:026",
-  "_gpid_": 3859
+  "id": "axc/v:026",
+  "gpid": 3859
 },
 { "name": "Light Tractor",
  "type": "PC",
  "cs#": 4,
  "note_number": "49",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:027",
-  "_gpid_": 3813
+  "id": "axc/v:027",
+  "gpid": 3813
 },
 { "name": "Medium Tractor",
  "type": "PC",
  "cs#": 5,
  "note_number": "49",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:028",
-  "_gpid_": 3815
+  "id": "axc/v:028",
+  "gpid": 3815
 },
 { "name": "Heavy Tractor",
  "type": "PC",
  "cs#": 6,
  "note_number": "49",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:029",
-  "_gpid_": 3817
+  "id": "axc/v:029",
+  "gpid": 3817
 },
 { "name": "Light Truck",
  "type": "tr",
  "cs#": 4,
  "note_number": "50",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:030",
-  "_gpid_": 3819
+  "id": "axc/v:030",
+  "gpid": 3819
 },
 { "name": "Medium Truck",
  "type": "tr",
  "cs#": 5,
  "note_number": "50",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:031",
-  "_gpid_": 3821
+  "id": "axc/v:031",
+  "gpid": 3821
 },
 { "name": "Heavy Truck",
  "type": "tr",
  "cs#": 7,
  "note_number": "50",
  "notes": [ "R", "H", "S", "C", "B" ],
-  "_id_": "axc/v:032",
-  "_gpid_": 3823
+  "id": "axc/v:032",
+  "gpid": 3823
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/croatian.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "24\u2020",
  "notes": [ "F" ],
-  "_id_": "cr/v:000",
-  "_gpid_": 3892
+  "id": "cr/v:000",
+  "gpid": 3892
 },
 { "name": "TKS(L)",
  "type": "Tt",
@ -15,39 +15,39 @@
  "CS#": 2,
  "note_number": "24\u2020",
  "notes": [ "F" ],
-  "_id_": "cr/v:001",
-  "_gpid_": 3894
+  "id": "cr/v:001",
+  "gpid": 3894
 },
 { "name": "L6/40(i)",
  "type": "LT",
  "CS#": 2,
  "note_number": "25",
-  "_id_": "cr/v:002",
-  "_gpid_": 3896
+  "id": "cr/v:002",
+  "gpid": 3896
 },
 { "name": "wz 34-I",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "26",
-  "_id_": "cr/v:003",
-  "_gpid_": 3898
+  "id": "cr/v:003",
+  "gpid": 3898
 },
 { "name": "wz 34-II",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "26",
-  "_id_": "cr/v:004",
-  "_gpid_": 3900
+  "id": "cr/v:004",
+  "gpid": 3900
 },
 { "name": "SMV L40 da 47/32",
  "type": "TD",
  "CS#": 3,
  "note_number": "27\u2020",
  "notes": [ "O\u2020<sup>1</sup>" ],
-  "_id_": "cr/v:005",
-  "_gpid_": 3902
+  "id": "cr/v:005",
+  "gpid": 3902
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/hungarian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/hungarian.json
@ -5,16 +5,16 @@
  "CS#": 3,
  "note_number": "7\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "hu/v:000",
-  "_gpid_": 4009
+  "id": "hu/v:000",
+  "gpid": 4009
 },
 { "name": "38M Toldi IIA",
  "type": "LT",
  "CS#": 3,
  "note_number": "8\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "hu/v:001",
-  "_gpid_": 4011
+  "id": "hu/v:001",
+  "gpid": 4011
 },
 { "name": "40M Turan I(r)",
  "type": "MT",
@ -22,8 +22,8 @@
  "capabilities2": { "sD": 5 },
  "note_number": "9\u2020",
  "notes": [ "E", "N", "Q" ],
-  "_id_": "hu/v:002",
-  "_gpid_": 4013
+  "id": "hu/v:002",
+  "gpid": 4013
 },
 { "name": "41M Turan II(r)",
  "type": "MT",
@ -31,8 +31,8 @@
  "capabilities2": { "AP": 6, "s": 7, "sD": 5 },
  "note_number": "10\u2020",
  "notes": [ "E", "N", "Q" ],
-  "_id_": "hu/v:003",
-  "_gpid_": 4015
+  "id": "hu/v:003",
+  "gpid": 4015
 },
 { "name": "PzKpfw VG(g)",
  "type": "MT",
@ -40,8 +40,8 @@
  "capabilities2": { "sN": 6 },
  "note_number": "11\u2020",
  "notes": [ "E" ],
-  "_id_": "hu/v:004",
-  "_gpid_": 4043
+  "id": "hu/v:004",
+  "gpid": 4043
 },
 { "name": "PzKpfw VIE(L)(g)",
  "type": "HT",
@ -49,8 +49,8 @@
  "capabilities2": { "A": [ [3,4] ], "sN": 6 },
  "note_number": "12\u2020",
  "notes": [ "E" ],
-  "_id_": "hu/v:005",
-  "_gpid_": 4045
+  "id": "hu/v:005",
+  "gpid": 4045
 },
 { "name": "43M Zrinyi II",
  "type": "AG",
@ -58,22 +58,22 @@
  "capabilities2": { "s": 7, "sD": 5 },
  "note_number": "13\u2020",
  "notes": [ "Q" ],
-  "_id_": "hu/v:006",
-  "_gpid_": 4055
+  "id": "hu/v:006",
+  "gpid": 4055
 },
 { "name": "39M Csaba",
  "type": "AC",
  "CS#": 4,
  "note_number": "14",
-  "_id_": "hu/v:007",
-  "_gpid_": 4065
+  "id": "hu/v:007",
+  "gpid": 4065
 },
 { "name": "40M Csaba",
  "type": "AC",
  "CS#": 4,
  "note_number": "14",
-  "_id_": "hu/v:008",
-  "_gpid_": 4067
+  "id": "hu/v:008",
+  "gpid": 4067
 },
 { "name": "Marder II(g)",
  "type": "TD",
@ -81,8 +81,8 @@
  "capabilities2": { "A": [ [4,3], [3,4] ], "HE": 7, "s": 6 },
  "note_number": "15",
  "notes": [ "E" ],
-  "_id_": "hu/v:009",
-  "_gpid_": 4057
+  "id": "hu/v:009",
+  "gpid": 4057
 },
 { "name": "40M Nimrod",
  "type": "TD/AA",
@ -90,8 +90,8 @@
  "capabilities2": { "H": [ ["6[9]","3+"] ] },
  "note_number": "16\u2020",
  "notes": [ "P\u2020<sup>1</sup>" ],
-  "_id_": "hu/v:010",
-  "_gpid_": 4059
+  "id": "hu/v:010",
+  "gpid": 4059
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/romanian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/romanian.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "E" ],
-  "_id_": "ro/v:000",
-  "_gpid_": 3861
+  "id": "ro/v:000",
+  "gpid": 3861
 },
 { "name": "R-35/45(f)",
  "type": "TD",
@ -15,24 +15,24 @@
  "CS#": 2,
  "note_number": "2",
  "notes": [ "D" ],
-  "_id_": "ro/v:001",
-  "_gpid_": 3863
+  "id": "ro/v:001",
+  "gpid": 3863
 },
 { "name": "TACAM T-60(r)",
  "type": "TD",
  "CS#": 3,
  "note_number": "3\u2020",
  "notes": [ "E" ],
-  "_id_": "ro/v:002",
-  "_gpid_": 3865
+  "id": "ro/v:002",
+  "gpid": 3865
 },
 { "name": "TACAM T-60A(r)",
  "type": "TD",
  "CS#": 3,
  "note_number": "3\u2020",
  "notes": [ "E" ],
-  "_id_": "ro/v:003",
-  "_gpid_": 3867
+  "id": "ro/v:003",
+  "gpid": 3867
 },
 { "name": "TACAM R-2(r)",
  "type": "TD",
@ -40,8 +40,8 @@
  "capabilities2": { "AP": 5 },
  "note_number": "4\u2020",
  "notes": [ "E", "N" ],
-  "_id_": "ro/v:004",
-  "_gpid_": 3869
+  "id": "ro/v:004",
+  "gpid": 3869
 },
 { "name": "BA-6(r)",
  "type": "AC",
@ -49,8 +49,8 @@
  "CS#": 4,
  "note_number": "5\u2020",
  "notes": [ "E" ],
-  "_id_": "ro/v:005",
-  "_gpid_": 3871
+  "id": "ro/v:005",
+  "gpid": 3871
 },
 { "name": "BA-20(r)",
  "type": "AC",
@ -58,16 +58,16 @@
  "CS#": 3,
  "note_number": "5\u2020",
  "notes": [ "E" ],
-  "_id_": "ro/v:006",
-  "_gpid_": 3873
+  "id": "ro/v:006",
+  "gpid": 3873
 },
 { "name": "Malaxa UE2",
  "type": "APC",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "6\u2020",
  "notes": [ "F", "I\u2020<sup>1</sup>", "J" ],
-  "_id_": "ro/v:007",
-  "_gpid_": [ 3875, 3877 ]
+  "id": "ro/v:007",
+  "gpid": [ 3875, 3877 ]
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/vehicles/axis-minor/slovakian.json
@ -6,16 +6,16 @@
  "CS#": 2,
  "note_number": "17\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "E", "F", "G\u2020<sup>2</sup>" ],
-  "_id_": "sl/v:000",
-  "_gpid_": 3879
+  "id": "sl/v:000",
+  "gpid": 3879
 },
 { "name": "LT vz 34",
  "type": "LT",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "18",
-  "_id_": "sl/v:001",
-  "_gpid_": 3881
+  "id": "sl/v:001",
+  "gpid": 3881
 },
 { "name": "PzKpfw IIA(g)",
  "type": "LT",
@ -23,8 +23,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "19",
  "notes": [ "E" ],
-  "_id_": "sl/v:002",
-  "_gpid_": 3883
+  "id": "sl/v:002",
+  "gpid": 3883
 },
 { "name": "LT vz 40(t)",
  "type": "LT",
@ -32,8 +32,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "20\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "E" ],
-  "_id_": "sl/v:003",
-  "_gpid_": 3885
+  "id": "sl/v:003",
+  "gpid": 3885
 },
 { "name": "Marder III(t)H",
  "type": "TD",
@ -41,24 +41,24 @@
  "capabilities2": { "A": [ [4,3], [3,4] ], "HE": 7, "s": 7, "sD": 6 },
  "note_number": "21\u2020",
  "notes": [ "E" ],
-  "_id_": "sl/v:004",
-  "_gpid_": 3887
+  "id": "sl/v:004",
+  "gpid": 3887
 },
 { "name": "Kfz 1(g)",
  "type": "tr",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "22\u2020",
  "notes": [ "E", "L\u2020<sup>2</sup>", "I\u2020<sup>1</sup>" ],
-  "_id_": "sl/v:005",
-  "_gpid_": 3889
+  "id": "sl/v:005",
+  "gpid": 3889
 },
 { "name": "SdKfz 2(g)",
  "type": "htMC",
  "cs#": 2,
  "note_number": "23\u2020",
  "notes": [ "E", "L\u2020<sup>1</sup>" ],
-  "_id_": "sl/v:006",
-  "_gpid_": 3891
+  "id": "sl/v:006",
+  "gpid": 3891
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/british.json
+++ b/vasl_templates/webapp/data/vehicles/british.json
--- a/vasl_templates/webapp/data/vehicles/chinese.json
+++ b/vasl_templates/webapp/data/vehicles/chinese.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "A", "<s>B</s>" ],
-  "_id_": "ch/v:000",
-  "_gpid_": 2063
+  "id": "ch/v:000",
+  "gpid": 2063
 },
 { "name": "L3/35(i)",
  "type": "Tt",
@ -15,8 +15,8 @@
  "CS#": "2\u2020",
  "note_number": "2\u2020",
  "notes": [ "A", "<s>B</s>", "D\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:001",
-  "_gpid_": 2065
+  "id": "ch/v:001",
+  "gpid": 2065
 },
 { "name": "PzKpfw IA(g)",
  "type": "Tt",
@ -24,8 +24,8 @@
  "CS#": 2,
  "note_number": "3\u2020",
  "notes": [ "A", "<s>B</s>", "D\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:002",
-  "_gpid_": 2067
+  "id": "ch/v:002",
+  "gpid": 2067
 },
 { "name": "Vickers 6-Ton Mk E(b)",
  "type": "LT",
@ -34,16 +34,16 @@
  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
  "note_number": "4\u2020",
  "notes": [ "A", "<s>B</s>", "C\u2020<sup>2</sup>", "E\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:003",
-  "_gpid_": 2069
+  "id": "ch/v:003",
+  "gpid": 2069
 },
 { "name": "T-26TU M33(r)",
  "type": "LT",
  "CS#": 3,
  "note_number": "5\u2020",
  "notes": [ "A", "E\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:004",
-  "_gpid_": [ 2071, 2073 ]
+  "id": "ch/v:004",
+  "gpid": [ 2071, 2073 ]
 },
 { "name": "M3A3(a)",
  "type": "LT",
@ -51,8 +51,8 @@
  "capabilities2": { "C": "9\u2020<sup>1</sup>" },
  "note_number": "6\u2020",
  "notes": [ "A", "B", "C\u2020<sup>1</sup>", "E\u2020<sup>2</sup>", "G" ],
-  "_id_": "ch/v:005",
-  "_gpid_": [ 2075, 2077 ]
+  "id": "ch/v:005",
+  "gpid": [ 2075, 2077 ]
 },
 { "name": "M4A4(a)",
  "type": "MT",
@ -60,24 +60,24 @@
  "capabilities2": { "s": 8, "WP": [ [7,"J4+"], "\u2020" ] },
  "note_number": "7\u2020",
  "notes": [ "A", "B", "E\u2020<sup>1</sup>", "G" ],
-  "_id_": "ch/v:006",
-  "_gpid_": [ 2079, 2081 ]
+  "id": "ch/v:006",
+  "gpid": [ 2079, 2081 ]
 },
 { "name": "M3A1(a)",
  "type": "SC",
  "CS#": 4,
  "note_number": "8\u2020",
  "notes": [ "A", "B", "E\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:007",
-  "_gpid_": 2085
+  "id": "ch/v:007",
+  "gpid": 2085
 },
 { "name": "Stuart Recon(a)",
  "type": "SC",
  "CS#": 5,
  "note_number": "9\u2020",
  "notes": [ "A", "B", "D\u2020<sup>1</sup>", "E\u2020<sup>2</sup>" ],
-  "_id_": "ch/v:008",
-  "_gpid_": 2087
+  "id": "ch/v:008",
+  "gpid": 2087
 },
 { "name": "Type 22",
  "type": "AC",
@ -85,24 +85,24 @@
  "CS#": 4,
  "note_number": "10\u2020<sup>1</sup>",
  "notes": [ "<s>B</s>", "E\u2020<sup>2</sup>", "F\u2020" ],
-  "_id_": "ch/v:009",
-  "_gpid_": 2089
+  "id": "ch/v:009",
+  "gpid": 2089
 },
 { "name": "PSW 221(g)",
  "type": "AC",
  "CS#": 2,
  "note_number": "11\u2020",
  "notes": [ "A", "<s>B</s>", "F\u2020" ],
-  "_id_": "ch/v:010",
-  "_gpid_": 2091
+  "id": "ch/v:010",
+  "gpid": 2091
 },
 { "name": "PSW 222(g)",
  "type": "AC",
  "CS#": 3,
  "note_number": "11\u2020",
  "notes": [ "A", "<s>B</s>", "E\u2020<sup>1</sup>", "F\u2020" ],
-  "_id_": "ch/v:011",
-  "_gpid_": 2093
+  "id": "ch/v:011",
+  "gpid": 2093
 },
 { "name": "BA-20(r)",
  "type": "AC",
@ -110,8 +110,8 @@
  "CS#": 3,
  "note_number": "12",
  "notes": [ "A", "<s>B</s>", "F\u2020" ],
-  "_id_": "ch/v:012",
-  "_gpid_": 2095
+  "id": "ch/v:012",
+  "gpid": 2095
 },
 { "name": "BA-6(r)",
  "type": "AC",
@ -119,64 +119,64 @@
  "CS#": 4,
  "note_number": "12",
  "notes": [ "A", "<s>B</s>", "E\u2020<sup>1</sup>", "F\u2020" ],
-  "_id_": "ch/v:013",
-  "_gpid_": 2097
+  "id": "ch/v:013",
+  "gpid": 2097
 },
 { "name": "VCL Mk VI Carrier(b)",
  "type": "APC",
  "CS#": "2\u2020",
  "note_number": "13\u2020",
  "notes": [ "A", "<s>B</s>", "H\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:014",
-  "_gpid_": [ 2101, 2103 ]
+  "id": "ch/v:014",
+  "gpid": [ 2101, 2103 ]
 },
 { "name": "Carrier A(b)",
  "type": "APC",
  "CS#": 3,
  "note_number": "14\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/v:015",
-  "_gpid_": 2105
+  "id": "ch/v:015",
+  "gpid": 2105
 },
 { "name": "Carrier B(b)",
  "type": "APC",
  "CS#": 3,
  "note_number": "14\u2020",
  "notes": [ "A", "E\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:016",
-  "_gpid_": 2107
+  "id": "ch/v:016",
+  "gpid": 2107
 },
 { "name": "Carrier C(b)",
  "type": "APC",
  "CS#": 3,
  "note_number": "14\u2020",
  "notes": [ "A", "E\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:017",
-  "_gpid_": 2109
+  "id": "ch/v:017",
+  "gpid": 2109
 },
 { "name": "Henschel 33(g)",
  "type": "tr",
  "cs#": 7,
  "note_number": "15\u2020<sup>1</sup>",
  "notes": [ "A", "F\u2020" ],
-  "_id_": "ch/v:018",
-  "_gpid_": 2111
+  "id": "ch/v:018",
+  "gpid": 2111
 },
 { "name": "Jeep(a)",
  "type": "tr",
  "cs#": "2\u2020",
  "note_number": "16\u2020",
  "notes": [ "A", "H\u2020<sup>1</sup>" ],
-  "_id_": "ch/v:019",
-  "_gpid_": 2113
+  "id": "ch/v:019",
+  "gpid": 2113
 },
 { "name": "2\u00bd-Ton(a)",
  "type": "tr",
  "cs#": 7,
  "note_number": "16\u2020",
  "notes": [ "A" ],
-  "_id_": "ch/v:020",
-  "_gpid_": 2116
+  "id": "ch/v:020",
+  "gpid": 2116
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/finnish.json
+++ b/vasl_templates/webapp/data/vehicles/finnish.json
@ -6,16 +6,16 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:000",
-  "_gpid_": 6841
+  "id": "fi/v:000",
+  "gpid": 6841
 },
 { "name": "T-50(r)",
  "type": "Tt",
  "CS#": 4,
  "note_number": "2\u2020",
  "notes": [ "D" ],
-  "_id_": "fi/v:001",
-  "_gpid_": 6849
+  "id": "fi/v:001",
+  "gpid": 6849
 },
 { "name": "Vikkersi(b)",
  "type": "LT",
@ -23,8 +23,8 @@
  "CS#": 3,
  "note_number": "3\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "D" ],
-  "_id_": "fi/v:002",
-  "_gpid_": 6853
+  "id": "fi/v:002",
+  "gpid": 6853
 },
 { "name": "T-26E(b)",
  "type": "LT",
@ -32,8 +32,8 @@
  "CS#": 3,
  "note_number": "4",
  "notes": [ "B\u2020", "D" ],
-  "_id_": "fi/v:003",
-  "_gpid_": 6861
+  "id": "fi/v:003",
+  "gpid": 6861
 },
 { "name": "T-26A(r)",
  "type": "LT",
@ -41,8 +41,8 @@
  "CS#": 3,
  "note_number": "5\u2020",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:004",
-  "_gpid_": 6865
+  "id": "fi/v:004",
+  "gpid": 6865
 },
 { "name": "T-26B(r)",
  "type": "LT",
@ -50,8 +50,8 @@
  "CS#": 3,
  "note_number": "6",
  "notes": [ "C\u2020", "D", "M" ],
-  "_id_": "fi/v:005",
-  "_gpid_": [ 7220, 6869 ]
+  "id": "fi/v:005",
+  "gpid": [ 7220, 6869 ]
 },
 { "name": "T-26C(r)",
  "type": "LT",
@ -59,8 +59,8 @@
  "CS#": 3,
  "note_number": "7",
  "notes": [ "C\u2020", "D", "M" ],
-  "_id_": "fi/v:006",
-  "_gpid_": 6873
+  "id": "fi/v:006",
+  "gpid": 6873
 },
 { "name": "OT-133(r)",
  "type": "LTv",
@ -68,8 +68,8 @@
  "CS#": 3,
  "note_number": "8",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:007",
-  "_gpid_": 6877
+  "id": "fi/v:007",
+  "gpid": 6877
 },
 { "name": "BT-5(r)",
  "type": "LT",
@ -77,8 +77,8 @@
  "CS#": 3,
  "note_number": "9",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:008",
-  "_gpid_": 6881
+  "id": "fi/v:008",
+  "gpid": 6881
 },
 { "name": "BT-7(r)",
  "type": "LT",
@ -86,8 +86,8 @@
  "CS#": 3,
  "note_number": "9",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:009",
-  "_gpid_": 6885
+  "id": "fi/v:009",
+  "gpid": 6885
 },
 { "name": "Postijuna(r)",
  "type": "MT",
@ -96,8 +96,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "10",
  "notes": [ "D", "F\u2020", "M" ],
-  "_id_": "fi/v:010",
-  "_gpid_": 6891
+  "id": "fi/v:010",
+  "gpid": 6891
 },
 { "name": "Postijuna(L)(r)",
  "type": "MT",
@ -106,8 +106,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "11",
  "notes": [ "D", "F\u2020", "M" ],
-  "_id_": "fi/v:011",
-  "_gpid_": 6895
+  "id": "fi/v:011",
+  "gpid": 6895
 },
 { "name": "Sotka(r)",
  "type": "MT",
@ -115,8 +115,8 @@
  "capabilities2": { "A": [ [3,"2+"] ] },
  "note_number": "12\u2020",
  "notes": [ "D", "E", "M" ],
-  "_id_": "fi/v:012",
-  "_gpid_": 6903
+  "id": "fi/v:012",
+  "gpid": 6903
 },
 { "name": "Sotka(L)(r)",
  "type": "MT",
@ -124,8 +124,8 @@
  "capabilities2": { "A": 3 },
  "note_number": "13\u2020",
  "notes": [ "D", "E" ],
-  "_id_": "fi/v:013",
-  "_gpid_": 6907
+  "id": "fi/v:013",
+  "gpid": 6907
 },
 { "name": "Pitk\u00e4putkinen Sotka(r)",
  "type": "MT",
@ -133,16 +133,16 @@
  "capabilities2": { "A": 3, "sD": "6\u2020" },
  "note_number": "14\u2020",
  "notes": [ "D" ],
-  "_id_": "fi/v:014",
-  "_gpid_": 6911
+  "id": "fi/v:014",
+  "gpid": 6911
 },
 { "name": "KV-1E(r)",
  "type": "HT",
  "CS#": 6,
  "note_number": "15\u2020",
  "notes": [ "D", "E", "M" ],
-  "_id_": "fi/v:015",
-  "_gpid_": 6917
+  "id": "fi/v:015",
+  "gpid": 6917
 },
 { "name": "KV-1 M42(r)",
  "type": "HT",
@ -150,8 +150,8 @@
  "capabilities2": { "A": 3 },
  "note_number": "15\u2020",
  "notes": [ "D", "E", "M" ],
-  "_id_": "fi/v:016",
-  "_gpid_": 6921
+  "id": "fi/v:016",
+  "gpid": 6921
 },
 { "name": "BT-42(r)",
  "type": "AG",
@ -162,8 +162,8 @@
  "capabilities2": { "s": 6 },
  "note_number": "16\u2020",
  "notes": [ "D", "M" ],
-  "_id_": "fi/v:017",
-  "_gpid_": 6925
+  "id": "fi/v:017",
+  "gpid": 6925
 },
 { "name": "Sturmi(g)",
  "type": "AG",
@ -171,8 +171,8 @@
  "capabilities2": { "A": 3, "H": 4, "s": 8 },
  "note_number": "17\u2020",
  "notes": [ "D" ],
-  "_id_": "fi/v:018",
-  "_gpid_": 6929
+  "id": "fi/v:018",
+  "gpid": 6929
 },
 { "name": "Landsverk Anti II(s)",
  "type": "TD/AA",
@ -180,30 +180,30 @@
  "CS#": 6,
  "note_number": "18",
  "notes": [ "A\u2020", "D" ],
-  "_id_": "fi/v:019",
-  "_gpid_": 6933
+  "id": "fi/v:019",
+  "gpid": 6933
 },
 { "name": "L182(s)",
  "type": "AC",
  "CS#": 5,
  "note_number": "19\u2020",
-  "_id_": "fi/v:020",
-  "_gpid_": 6937
+  "id": "fi/v:020",
+  "gpid": 6937
 },
 { "name": "L182(L)(s)",
  "type": "AC",
  "CS#": 5,
  "note_number": "19\u2020",
-  "_id_": "fi/v:021",
-  "_gpid_": 6941
+  "id": "fi/v:021",
+  "gpid": 6941
 },
 { "name": "BA-20(r)",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 3,
  "note_number": "20\u2020",
-  "_id_": "fi/v:022",
-  "_gpid_": 6945
+  "id": "fi/v:022",
+  "gpid": 6945
 },
 { "name": "BA-6(r)",
  "type": "AC",
@ -211,68 +211,68 @@
  "CS#": 4,
  "note_number": "21",
  "notes": [ "D" ],
-  "_id_": "fi/v:023",
-  "_gpid_": 6949
+  "id": "fi/v:023",
+  "gpid": 6949
 },
 { "name": "GAZ-4M-AA(r)",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "22\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "fi/v:024",
-  "_gpid_": 6955
+  "id": "fi/v:024",
+  "gpid": 6955
 },
 { "name": "T-20(r)",
  "type": "APC",
  "CS#": "2\u2020",
  "note_number": "23\u2020",
  "notes": [ "D" ],
-  "_id_": "fi/v:025",
-  "_gpid_": 6959
+  "id": "fi/v:025",
+  "gpid": 6959
 },
 { "name": "RSO(g)",
  "type": "PC",
  "cs#": 5,
  "note_number": "24",
  "notes": [ "D" ],
-  "_id_": "fi/v:026",
-  "_gpid_": 6967
+  "id": "fi/v:026",
+  "gpid": 6967
 },
 { "name": "STZ-3(r)",
  "type": "PC",
  "cs#": 4,
  "note_number": "25",
  "notes": [ "D" ],
-  "_id_": "fi/v:027",
-  "_gpid_": 6975
+  "id": "fi/v:027",
+  "gpid": 6975
 },
 { "name": "Tempo G1200",
  "type": "tr",
  "cs#": 2,
  "note_number": "26\u2020",
-  "_id_": "fi/v:028",
-  "_gpid_": 6979
+  "id": "fi/v:028",
+  "gpid": 6979
 },
 { "name": "Light Truck",
  "type": "tr",
  "cs#": 6,
  "note_number": "27\u2020",
-  "_id_": "fi/v:029",
-  "_gpid_": 6981
+  "id": "fi/v:029",
+  "gpid": 6981
 },
 { "name": "Medium Truck",
  "type": "tr",
  "cs#": 7,
  "note_number": "27\u2020",
-  "_id_": "fi/v:030",
-  "_gpid_": 6985
+  "id": "fi/v:030",
+  "gpid": 6985
 },
 { "name": "Heavy Truck",
  "type": "tr",
  "cs#": 7,
  "note_number": "27",
-  "_id_": "fi/v:031",
-  "_gpid_": 6991
+  "id": "fi/v:031",
+  "gpid": 6991
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/french.json
+++ b/vasl_templates/webapp/data/vehicles/french.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "C" ],
-  "_id_": "fr/v:000",
-  "_gpid_": 1713
+  "id": "fr/v:000",
+  "gpid": 1713
 },
 { "name": "FT-17C",
  "type": "Tt",
@ -16,8 +16,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "1\u2020",
  "notes": [ "C" ],
-  "_id_": "fr/v:001",
-  "_gpid_": 1715
+  "id": "fr/v:001",
+  "gpid": 1715
 },
 { "name": "FT-17 75BS",
  "type": "Tt",
@ -26,8 +26,8 @@
  "no_if": true,
  "note_number": "1\u2020",
  "notes": [ "C" ],
-  "_id_": "fr/v:002",
-  "_gpid_": 1717
+  "id": "fr/v:002",
+  "gpid": 1717
 },
 { "name": "AMR 33",
  "type": "Tt",
@ -35,8 +35,8 @@
  "CS#": 2,
  "note_number": "2\u2020",
  "notes": [ "E" ],
-  "_id_": "fr/v:003",
-  "_gpid_": 1719
+  "id": "fr/v:003",
+  "gpid": 1719
 },
 { "name": "AMR 35",
  "type": "Tt",
@ -44,8 +44,8 @@
  "CS#": 2,
  "note_number": "3\u2020",
  "notes": [ "E" ],
-  "_id_": "fr/v:004",
-  "_gpid_": 1721
+  "id": "fr/v:004",
+  "gpid": 1721
 },
 { "name": "AMR 35(L)",
  "type": "Tt",
@ -53,8 +53,8 @@
  "CS#": 2,
  "note_number": "3\u2020",
  "notes": [ "E" ],
-  "_id_": "fr/v:005",
-  "_gpid_": 1723
+  "id": "fr/v:005",
+  "gpid": 1723
 },
 { "name": "R35",
  "type": "LT",
@ -63,8 +63,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "4\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C" ],
-  "_id_": "fr/v:006",
-  "_gpid_": 1725
+  "id": "fr/v:006",
+  "gpid": 1725
 },
 { "name": "H35",
  "type": "LT",
@ -73,8 +73,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "5\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C", "E" ],
-  "_id_": "fr/v:007",
-  "_gpid_": 1731
+  "id": "fr/v:007",
+  "gpid": 1731
 },
 { "name": "FCM 36",
  "type": "LT",
@ -83,8 +83,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "6\u2020",
  "notes": [ "C", "E", "I\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:008",
-  "_gpid_": 1735
+  "id": "fr/v:008",
+  "gpid": 1735
 },
 { "name": "H39",
  "type": "LT",
@ -93,8 +93,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "7\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C", "F" ],
-  "_id_": "fr/v:009",
-  "_gpid_": [ 1737, 1739 ]
+  "id": "fr/v:009",
+  "gpid": [ 1737, 1739 ]
 },
 { "name": "H39(L)",
  "type": "LT",
@ -103,8 +103,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "8\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C", "E", "F" ],
-  "_id_": "fr/v:010",
-  "_gpid_": [ 1741, 1743 ]
+  "id": "fr/v:010",
+  "gpid": [ 1741, 1743 ]
 },
 { "name": "H35(L)",
  "type": "LT",
@ -113,8 +113,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "8\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C", "E" ],
-  "_id_": "fr/v:011",
-  "_gpid_": 1733
+  "id": "fr/v:011",
+  "gpid": 1733
 },
 { "name": "R35(L)",
  "type": "LT",
@ -123,8 +123,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "8\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "C", "E", "F" ],
-  "_id_": "fr/v:012",
-  "_gpid_": [ 1727, 1729 ]
+  "id": "fr/v:012",
+  "gpid": [ 1727, 1729 ]
 },
 { "name": "R40",
  "type": "LT",
@ -133,8 +133,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "9",
  "notes": [ "A\u2020<sup>1</sup>", "C", "E", "I\u2020" ],
-  "_id_": "fr/v:013",
-  "_gpid_": 1745
+  "id": "fr/v:013",
+  "gpid": 1745
 },
 { "name": "D1",
  "type": "MT",
@ -142,8 +142,8 @@
  "CS#": 3,
  "note_number": "10\u2020",
  "notes": [ "B\u2020<sup>3</sup>", "C", "I\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:014",
-  "_gpid_": 1747
+  "id": "fr/v:014",
+  "gpid": 1747
 },
 { "name": "D2",
  "type": "MT",
@ -151,8 +151,8 @@
  "CS#": 3,
  "note_number": "11\u2020",
  "notes": [ "B\u2020<sup>3</sup>", "C", "E", "I\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:015",
-  "_gpid_": 1749
+  "id": "fr/v:015",
+  "gpid": 1749
 },
 { "name": "D2(L)",
  "type": "MT",
@ -160,8 +160,8 @@
  "CS#": 3,
  "note_number": "11\u2020",
  "notes": [ "A\u2020<sup>4</sup>", "B\u2020<sup>3</sup>", "C", "E", "I\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:016",
-  "_gpid_": 1751
+  "id": "fr/v:016",
+  "gpid": 1751
 },
 { "name": "S35",
  "type": "MT",
@ -169,8 +169,8 @@
  "CS#": 4,
  "note_number": "12\u2020",
  "notes": [ "A\u2020<sup>3</sup>", "C", "F", "I\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:017",
-  "_gpid_": [ 1753, 1755 ]
+  "id": "fr/v:017",
+  "gpid": [ 1753, 1755 ]
 },
 { "name": "B1-bis",
  "type": "HT",
@ -180,8 +180,8 @@
  "capabilities": [ "AP9<sup>75</sup>\u2020" ],
  "note_number": "13\u2020",
  "notes": [ "A\u2020<sup>4</sup>", "B\u2020<sup>3</sup>", "C", "E", "F", "I\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:018",
-  "_gpid_": [ 1757, 1759 ]
+  "id": "fr/v:018",
+  "gpid": [ 1757, 1759 ]
 },
 { "name": "Valentine V(b)",
  "type": "HT",
@ -189,8 +189,8 @@
  "capabilities2": { "sM": 8 },
  "note_number": "14\u2020",
  "notes": [ "F" ],
-  "_id_": "fr/v:019",
-  "_gpid_": [ 1761, 1763 ]
+  "id": "fr/v:019",
+  "gpid": [ 1761, 1763 ]
 },
 { "name": "AM Dodge(a)",
  "type": "SC",
@ -198,8 +198,8 @@
  "capabilities2": { "AP": 10 },
  "note_number": "15\u2020",
  "notes": [ "F" ],
-  "_id_": "fr/v:020",
-  "_gpid_": [ 1767, 1769, 1771 ]
+  "id": "fr/v:020",
+  "gpid": [ 1767, 1769, 1771 ]
 },
 { "name": "AMD 20 cv TOE",
  "type": "AC",
@ -208,8 +208,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "16\u2020",
  "notes": [ "D\u2020<sup>2</sup>", "R\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:021",
-  "_gpid_": 1773
+  "id": "fr/v:021",
+  "gpid": 1773
 },
 { "name": "AMD 50 AM",
  "type": "AC",
@ -218,8 +218,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "17\u2020",
  "notes": [ "D\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:022",
-  "_gpid_": 1775
+  "id": "fr/v:022",
+  "gpid": 1775
 },
 { "name": "AMD 80 AM",
  "type": "AC",
@ -227,8 +227,8 @@
  "CS#": 4,
  "note_number": "17\u2020",
  "notes": [ "D\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:023",
-  "_gpid_": 1777
+  "id": "fr/v:023",
+  "gpid": 1777
 },
 { "name": "AMD 35",
  "type": "AC",
@ -236,16 +236,16 @@
  "CS#": 4,
  "note_number": "18\u2020",
  "notes": [ "E" ],
-  "_id_": "fr/v:024",
-  "_gpid_": [ 1779, 1781 ]
+  "id": "fr/v:024",
+  "gpid": [ 1779, 1781 ]
 },
 { "name": "Laffly W15T CC",
  "type": "TDtr",
  "CS#": 3,
  "note_number": "19\u2020",
  "notes": [ "E", "J\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:025",
-  "_gpid_": 1785
+  "id": "fr/v:025",
+  "gpid": 1785
 },
 { "name": "Ac de 75 Conus(b)",
  "type": "SPAtr",
@ -253,8 +253,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "20\u2020",
  "notes": [ "F", "M\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:026",
-  "_gpid_": 1787
+  "id": "fr/v:026",
+  "gpid": 1787
 },
 { "name": "Ac de 75 mle 97",
  "type": "SPAtr",
@ -262,55 +262,55 @@
  "capabilities2": { "s": 8 },
  "note_number": "20\u2020",
  "notes": [ "M\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:027",
-  "_gpid_": 1789
+  "id": "fr/v:027",
+  "gpid": 1789
 },
 { "name": "Camion de Mitrailleuse CA",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "21\u2020",
-  "_id_": "fr/v:028",
-  "_gpid_": 1791
+  "id": "fr/v:028",
+  "gpid": 1791
 },
 { "name": "Camion de 13.2 CAJ",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "21\u2020",
  "notes": [ "AA\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:029",
-  "_gpid_": 1793
+  "id": "fr/v:029",
+  "gpid": 1793
 },
 { "name": "Camion de 20 CA",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "21\u2020",
  "notes": [ "AA\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:030",
-  "_gpid_": 1795
+  "id": "fr/v:030",
+  "gpid": 1795
 },
 { "name": "Ac de 25 CA",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "21\u2020",
  "notes": [ "F", "AA\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:031",
-  "_gpid_": 1797
+  "id": "fr/v:031",
+  "gpid": 1797
 },
 { "name": "Ac de 40 CA(a)",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "22",
  "notes": [ "E", "F", "M\u2020", "AA\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:032",
-  "_gpid_": 1801
+  "id": "fr/v:032",
+  "gpid": 1801
 },
 { "name": "Ac de 75 mle 13/34",
  "type": "AAtr",
  "CS#": 7,
  "note_number": "23\u2020",
  "notes": [ "D\u2020<sup>1</sup>", "F", "AA\u2020<sup>2</sup>" ],
-  "_id_": "fr/v:033",
-  "_gpid_": 1803
+  "id": "fr/v:033",
+  "gpid": 1803
 },
 { "name": "AMC 29",
  "type": "ht",
@ -318,124 +318,124 @@
  "CS#": 3,
  "capabilities2": { "AP": 9 },
  "note_number": "24\u2020",
-  "_id_": "fr/v:034",
-  "_gpid_": 1807
+  "id": "fr/v:034",
+  "gpid": 1807
 },
 { "name": "C-K P17",
  "type": "ht",
  "cs#": 4,
  "note_number": "25\u2020",
-  "_id_": "fr/v:035",
-  "_gpid_": 1809
+  "id": "fr/v:035",
+  "gpid": 1809
 },
 { "name": "C-K P19",
  "type": "ht",
  "cs#": 5,
  "note_number": "25\u2020",
  "notes": [ "H\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:036",
-  "_gpid_": 1811
+  "id": "fr/v:036",
+  "gpid": 1811
 },
 { "name": "SOMUA MCG",
  "type": "ht",
  "cs#": 4,
  "note_number": "26\u2020",
-  "_id_": "fr/v:037",
-  "_gpid_": 1813
+  "id": "fr/v:037",
+  "gpid": 1813
 },
 { "name": "Unic P107",
  "type": "ht",
  "cs#": 5,
  "note_number": "27\u2020",
  "notes": [ "L\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:038",
-  "_gpid_": 1815
+  "id": "fr/v:038",
+  "gpid": 1815
 },
 { "name": "Renault UE",
  "type": "APC",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "28\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "K" ],
-  "_id_": "fr/v:039",
-  "_gpid_": [ 1817, 1819 ]
+  "id": "fr/v:039",
+  "gpid": [ 1817, 1819 ]
 },
 { "name": "Lorraine 38L",
  "type": "APC",
  "cs#": "3/2\u2020",
  "note_number": "29\u2020",
  "notes": [ "E", "H\u2020" ],
-  "_id_": "fr/v:040",
-  "_gpid_": 1821
+  "id": "fr/v:040",
+  "gpid": 1821
 },
 { "name": "Lorraine 37L 44",
  "type": "APC",
  "CS#": 3,
  "note_number": "30\u2020",
  "notes": [ "E", "K" ],
-  "_id_": "fr/v:041",
-  "_gpid_": 1824
+  "id": "fr/v:041",
+  "gpid": 1824
 },
 { "name": "Carrier AC(b)",
  "type": "APCv",
  "CS#": 3,
  "note_number": "31\u2020",
  "notes": [ "F", "M\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:042",
-  "_gpid_": 1826
+  "id": "fr/v:042",
+  "gpid": 1826
 },
 { "name": "Latil TAR H2",
  "type": "PC",
  "cs#": 5,
  "note_number": "32\u2020",
  "notes": [ "J\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:043",
-  "_gpid_": 1828
+  "id": "fr/v:043",
+  "gpid": 1828
 },
 { "name": "Laffly S15T",
  "type": "PC",
  "cs#": 5,
  "note_number": "33\u2020",
  "notes": [ "J\u2020<sup>1</sup>", "L\u2020<sup>2</sup>" ],
-  "_id_": "fr/v:044",
-  "_gpid_": 1830
+  "id": "fr/v:044",
+  "gpid": 1830
 },
 { "name": "Laffly S20TL",
  "type": "PC",
  "cs#": 5,
  "note_number": "34\u2020",
  "notes": [ "E", "J\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:045",
-  "_gpid_": 1832
+  "id": "fr/v:045",
+  "gpid": 1832
 },
 { "name": "Laffly V15T",
  "type": "PC",
  "cs#": 5,
  "note_number": "35",
  "notes": [ "E", "J\u2020" ],
-  "_id_": "fr/v:046",
-  "_gpid_": 1834
+  "id": "fr/v:046",
+  "gpid": 1834
 },
 { "name": "Peugeot 202",
  "type": "tr",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "36\u2020",
  "notes": [ "G\u2020<sup>1</sup>" ],
-  "_id_": "fr/v:047",
-  "_gpid_": 1836
+  "id": "fr/v:047",
+  "gpid": 1836
 },
 { "name": "Citro\u00ebn 23",
  "type": "tr",
  "cs#": 5,
  "note_number": "36\u2020",
-  "_id_": "fr/v:048",
-  "_gpid_": 1837
+  "id": "fr/v:048",
+  "gpid": 1837
 },
 { "name": "Renault AGR2",
  "type": "tr",
  "cs#": 7,
  "note_number": "36\u2020",
-  "_id_": "fr/v:049",
-  "_gpid_": 1839
+  "id": "fr/v:049",
+  "gpid": 1839
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/german.json
+++ b/vasl_templates/webapp/data/vehicles/german.json
--- a/vasl_templates/webapp/data/vehicles/italian.json
+++ b/vasl_templates/webapp/data/vehicles/italian.json
@ -6,16 +6,16 @@
  "CS#": 2,
  "note_number": "1\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "it/v:000",
-  "_gpid_": 3466
+  "id": "it/v:000",
+  "gpid": 3466
 },
 { "name": "L5/30",
  "type": "Tt",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "1\u2020",
-  "_id_": "it/v:001",
-  "_gpid_": 3468
+  "id": "it/v:001",
+  "gpid": 3468
 },
 { "name": "L3/35",
  "type": "Tt",
@ -23,8 +23,8 @@
  "CS#": 2,
  "note_number": "2\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "B\u2020<sup>1</sup>", "E", "N", "R" ],
-  "_id_": "it/v:002",
-  "_gpid_": 3470
+  "id": "it/v:002",
+  "gpid": 3470
 },
 { "name": "L3 aa",
  "type": "Tt",
@ -32,8 +32,8 @@
  "CS#": 2,
  "note_number": "3\u2020",
  "notes": [ "C", "E\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "N", "R" ],
-  "_id_": "it/v:003",
-  "_gpid_": 3472
+  "id": "it/v:003",
+  "gpid": 3472
 },
 { "name": "L3 cc",
  "type": "Tt",
@ -41,8 +41,8 @@
  "CS#": 2,
  "note_number": "4\u2020",
  "notes": [ "E", "J\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/v:004",
-  "_gpid_": 3474
+  "id": "it/v:004",
+  "gpid": 3474
 },
 { "name": "L3 Lf",
  "type": "Ttv",
@ -50,16 +50,16 @@
  "CS#": 2,
  "note_number": "5\u2020",
  "notes": [ "E\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/v:005",
-  "_gpid_": 3476
+  "id": "it/v:005",
+  "gpid": 3476
 },
 { "name": "L6/40",
  "type": "LT",
  "CS#": 2,
  "note_number": "6\u2020",
  "notes": [ "N", "R" ],
-  "_id_": "it/v:006",
-  "_gpid_": 3479
+  "id": "it/v:006",
+  "gpid": 3479
 },
 { "name": "M11/39",
  "type": "MT",
@ -67,8 +67,8 @@
  "CS#": 3,
  "note_number": "7\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/v:007",
-  "_gpid_": 3481
+  "id": "it/v:007",
+  "gpid": 3481
 },
 { "name": "M13/40",
  "type": "MT",
@ -76,32 +76,32 @@
  "CS#": 4,
  "note_number": "8\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>", "N" ],
-  "_id_": "it/v:008",
-  "_gpid_": [ 3483, 3485 ]
+  "id": "it/v:008",
+  "gpid": [ 3483, 3485 ]
 },
 { "name": "M14/41",
  "type": "MT",
  "CS#": 4,
  "note_number": "9\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>", "N" ],
-  "_id_": "it/v:009",
-  "_gpid_": [ 3487, 3489 ]
+  "id": "it/v:009",
+  "gpid": [ 3487, 3489 ]
 },
 { "name": "M15/42",
  "type": "MT",
  "CS#": 4,
  "note_number": "10\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>" ],
-  "_id_": "it/v:010",
-  "_gpid_": [ 3491, 3493 ]
+  "id": "it/v:010",
+  "gpid": [ 3491, 3493 ]
 },
 { "name": "MR/35(f)",
  "type": "MT",
  "CS#": 2,
  "note_number": "11\u2020",
  "notes": [ "I\u2020<sup>1</sup>" ],
-  "_id_": "it/v:011",
-  "_gpid_": 3495
+  "id": "it/v:011",
+  "gpid": 3495
 },
 { "name": "SMV M40 75/18",
  "type": "AG",
@ -109,8 +109,8 @@
  "capabilities2": { "H": [ [7,"S2+"], "\u2020<sup>2</sup>" ], "s": 8 },
  "note_number": "12",
  "notes": [ "C\u2020<sup>1</sup>", "F\u2020", "H\u2020<sup>2</sup>", "N" ],
-  "_id_": "it/v:012",
-  "_gpid_": [ 3499, 3501 ]
+  "id": "it/v:012",
+  "gpid": [ 3499, 3501 ]
 },
 { "name": "SMV M41 75/18",
  "type": "AG",
@ -118,8 +118,8 @@
  "capabilities2": { "H": [ [7,"S2+"], "\u2020<sup>2</sup>" ], "s": 8 },
  "note_number": "12\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "H\u2020<sup>2</sup>", "N" ],
-  "_id_": "it/v:013",
-  "_gpid_": [ 3503, 3505 ]
+  "id": "it/v:013",
+  "gpid": [ 3503, 3505 ]
 },
 { "name": "SMV M42 75/18",
  "type": "AG",
@ -127,8 +127,8 @@
  "capabilities2": { "H": 7, "s": 8 },
  "note_number": "13",
  "notes": [ "C\u2020" ],
-  "_id_": "it/v:014",
-  "_gpid_": 3507
+  "id": "it/v:014",
+  "gpid": 3507
 },
 { "name": "SMV M42 75/32",
  "type": "AG",
@ -136,8 +136,8 @@
  "capabilities2": { "H": 7, "s": 8 },
  "note_number": "13\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "it/v:015",
-  "_gpid_": 3509
+  "id": "it/v:015",
+  "gpid": 3509
 },
 { "name": "SMV M43 105/25",
  "type": "AG",
@ -146,16 +146,16 @@
  "capabilities2": { "H": 7, "s": 8 },
  "note_number": "14",
  "notes": [ "C\u2020" ],
-  "_id_": "it/v:016",
-  "_gpid_": 3511
+  "id": "it/v:016",
+  "gpid": 3511
 },
 { "name": "SMV L40 47/32",
  "type": "TD",
  "CS#": 3,
  "note_number": "15\u2020",
  "notes": [ "N<sup>T</sup>", "R" ],
-  "_id_": "it/v:017",
-  "_gpid_": 3513
+  "id": "it/v:017",
+  "gpid": 3513
 },
 { "name": "SMV M41M 90/53",
  "type": "TD",
@ -163,40 +163,40 @@
  "capabilities2": { "HE": 7 },
  "note_number": "16\u2020",
  "notes": [ "D\u2020<sup>1</sup>" ],
-  "_id_": "it/v:018",
-  "_gpid_": 3515
+  "id": "it/v:018",
+  "gpid": 3515
 },
 { "name": "AS 42",
  "type": "SC",
  "CS#": 3,
  "note_number": "17\u2020",
  "notes": [ "L\u2020<sup>1</sup>", "M", "N" ],
-  "_id_": "it/v:019",
-  "_gpid_": 3519
+  "id": "it/v:019",
+  "gpid": 3519
 },
 { "name": "AS 42 aa",
  "type": "SC",
  "CS#": 4,
  "note_number": "17\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "L\u2020<sup>2</sup>", "M", "N", "AA\u2020<sup>1</sup>" ],
-  "_id_": "it/v:020",
-  "_gpid_": 3521
+  "id": "it/v:020",
+  "gpid": 3521
 },
 { "name": "AS 42 cc",
  "type": "SC",
  "CS#": 4,
  "note_number": "17\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "J\u2020<sup>1</sup>", "L\u2020<sup>2</sup>", "M", "N" ],
-  "_id_": "it/v:021",
-  "_gpid_": 3523
+  "id": "it/v:021",
+  "gpid": 3523
 },
 { "name": "Lince",
  "type": "SC",
  "CS#": 2,
  "note_number": "18",
  "notes": [ "E" ],
-  "_id_": "it/v:022",
-  "_gpid_": 3525
+  "id": "it/v:022",
+  "gpid": 3525
 },
 { "name": "Lancia 1ZM",
  "type": "AC",
@ -204,8 +204,8 @@
  "CS#": 6,
  "note_number": "19\u2020",
  "notes": [ "A\u2020<sup>2</sup>", "F\u2020<sup>3</sup>", "M\u2020<sup>1</sup>" ],
-  "_id_": "it/v:023",
-  "_gpid_": 3527
+  "id": "it/v:023",
+  "gpid": 3527
 },
 { "name": "Fiat 611A",
  "type": "AC",
@ -213,8 +213,8 @@
  "CS#": 5,
  "note_number": "20\u2020",
  "notes": [ "A\u2020<sup>2</sup>", "F\u2020<sup>3</sup>", "M\u2020<sup>1</sup>" ],
-  "_id_": "it/v:024",
-  "_gpid_": 3529
+  "id": "it/v:024",
+  "gpid": 3529
 },
 { "name": "Fiat 611B",
  "type": "AC",
@ -223,40 +223,40 @@
  "capabilities2": { "HE": 7 },
  "note_number": "20\u2020",
  "notes": [ "F\u2020<sup>2</sup>", "M\u2020<sup>1</sup>" ],
-  "_id_": "it/v:025",
-  "_gpid_": 3531
+  "id": "it/v:025",
+  "gpid": 3531
 },
 { "name": "AB 40",
  "type": "AC",
  "CS#": 4,
  "note_number": "21",
  "notes": [ "A\u2020", "I\u2020<sup>1</sup>", "N" ],
-  "_id_": "it/v:026",
-  "_gpid_": 3533
+  "id": "it/v:026",
+  "gpid": 3533
 },
 { "name": "AB 41",
  "type": "AC",
  "CS#": 4,
  "note_number": "21\u2020",
  "notes": [ "N", "R" ],
-  "_id_": "it/v:027",
-  "_gpid_": 3535
+  "id": "it/v:027",
+  "gpid": 3535
 },
 { "name": "Autoprot S37",
  "type": "APC",
  "CS#": 4,
  "note_number": "22\u2020",
  "notes": [ "R" ],
-  "_id_": "it/v:028",
-  "_gpid_": 3539
+  "id": "it/v:028",
+  "gpid": 3539
 },
 { "name": "Autocann 20/65(b)",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "23\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "N", "R", "AA\u2020" ],
-  "_id_": "it/v:029",
-  "_gpid_": 3545
+  "id": "it/v:029",
+  "gpid": 3545
 },
 { "name": "Autocann 65/17(b)",
  "type": "SPAtr",
@ -264,8 +264,8 @@
  "capabilities2": { "H": [ [7,"S2+"], "\u2020<sup>2</sup>" ] },
  "note_number": "23\u2020",
  "notes": [ "G\u2020<sup>1</sup>", "H\u2020<sup>2</sup>", "N" ],
-  "_id_": "it/v:030",
-  "_gpid_": 3541
+  "id": "it/v:030",
+  "gpid": 3541
 },
 { "name": "Autocann 75/27",
  "type": "AAtr",
@ -273,80 +273,80 @@
  "capabilities2": { "AP": 7 },
  "note_number": "24",
  "notes": [ "D\u2020", "N", "AA\u2020<sup>1</sup>" ],
-  "_id_": "it/v:031",
-  "_gpid_": 3547
+  "id": "it/v:031",
+  "gpid": 3547
 },
 { "name": "Autocann 90/53",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "24",
  "notes": [ "D\u2020", "N", "AA\u2020<sup>1</sup>" ],
-  "_id_": "it/v:032",
-  "_gpid_": 3549
+  "id": "it/v:032",
+  "gpid": 3549
 },
 { "name": "TL 37",
  "type": "tr",
  "cs#": 5,
  "note_number": "25\u2020",
  "notes": [ "L\u2020<sup>1</sup>", "M", "N", "R" ],
-  "_id_": "it/v:033",
-  "_gpid_": 3551
+  "id": "it/v:033",
+  "gpid": 3551
 },
 { "name": "TM 40",
  "type": "tr",
  "cs#": 5,
  "note_number": "25\u2020",
  "notes": [ "L\u2020<sup>1</sup>", "M", "N", "R" ],
-  "_id_": "it/v:034",
-  "_gpid_": 3553
+  "id": "it/v:034",
+  "gpid": 3553
 },
 { "name": "TP 32",
  "type": "tr",
  "cs#": 5,
  "note_number": "25\u2020",
  "notes": [ "L\u2020<sup>1</sup>", "M", "N", "R" ],
-  "_id_": "it/v:035",
-  "_gpid_": 3555
+  "id": "it/v:035",
+  "gpid": 3555
 },
 { "name": "Autocaretta",
  "type": "tr",
  "cs#": "5\u2020<sup>1</sup>",
  "note_number": "26\u2020",
  "notes": [ "K\u2020<sup>1</sup>", "N", "R" ],
-  "_id_": "it/v:036",
-  "_gpid_": [ 3557, 3559 ]
+  "id": "it/v:036",
+  "gpid": [ 3557, 3559 ]
 },
 { "name": "Fiat 508 MC",
  "type": "tr",
  "cs#": "2\u2020<sup>1</sup>",
  "note_number": "27\u2020",
  "notes": [ "A\u2020<sup>2</sup>", "K\u2020<sup>1</sup>", "N", "R" ],
-  "_id_": "it/v:037",
-  "_gpid_": [ 3561, 3562 ]
+  "id": "it/v:037",
+  "gpid": [ 3561, 3562 ]
 },
 { "name": "Autocarro L",
  "type": "tr",
  "cs#": 6,
  "note_number": "28\u2020",
  "notes": [ "N", "R" ],
-  "_id_": "it/v:038",
-  "_gpid_": 3563
+  "id": "it/v:038",
+  "gpid": 3563
 },
 { "name": "Autocarro M",
  "type": "tr",
  "cs#": 7,
  "note_number": "28\u2020",
  "notes": [ "N", "R" ],
-  "_id_": "it/v:039",
-  "_gpid_": 3565
+  "id": "it/v:039",
+  "gpid": 3565
 },
 { "name": "Autocarro P",
  "type": "tr",
  "cs#": 7,
  "note_number": "28\u2020",
  "notes": [ "N", "R" ],
-  "_id_": "it/v:040",
-  "_gpid_": 3567
+  "id": "it/v:040",
+  "gpid": 3567
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/japanese.json
+++ b/vasl_templates/webapp/data/vehicles/japanese.json
@ -6,8 +6,8 @@
  "CS#": 3,
  "note_number": "1\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ja/v:000",
-  "_gpid_": 3310
+  "id": "ja/v:000",
+  "gpid": 3310
 },
 { "name": "Type 92B",
  "type": "Tt",
@ -15,32 +15,32 @@
  "CS#": 3,
  "note_number": "1\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ja/v:001",
-  "_gpid_": 3312
+  "id": "ja/v:001",
+  "gpid": 3312
 },
 { "name": "Type 94",
  "type": "Tt",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "2\u2020",
-  "_id_": "ja/v:002",
-  "_gpid_": 3314
+  "id": "ja/v:002",
+  "gpid": 3314
 },
 { "name": "Type 95 SO-KI",
  "type": "Tt",
  "no_radio": "\u00ae",
  "CS#": 5,
  "note_number": "3\u2020",
-  "_id_": "ja/v:003",
-  "_gpid_": 3316
+  "id": "ja/v:003",
+  "gpid": 3316
 },
 { "name": "Type 97A TE-KE",
  "type": "Tt",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "4\u2020",
-  "_id_": "ja/v:004",
-  "_gpid_": 3318
+  "id": "ja/v:004",
+  "gpid": 3318
 },
 { "name": "Type 97B TE-KE",
  "type": "Tt",
@ -48,8 +48,8 @@
  "CS#": 2,
  "no_if": true,
  "note_number": "4\u2020",
-  "_id_": "ja/v:005",
-  "_gpid_": 3320
+  "id": "ja/v:005",
+  "gpid": 3320
 },
 { "name": "Type 95 HA-GO",
  "type": "LT",
@ -58,22 +58,22 @@
  "capabilities2": { "sD": [ [5,"4+"], "\u2020<sup>1</sup>" ] },
  "note_number": "5\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>" ],
-  "_id_": "ja/v:006",
-  "_gpid_": 3322
+  "id": "ja/v:006",
+  "gpid": 3322
 },
 { "name": "Type 2 KA-MI",
  "type": "aLT",
  "CS#": "5\u2020",
  "note_number": "6\u2020",
-  "_id_": "ja/v:007",
-  "_gpid_": 3326
+  "id": "ja/v:007",
+  "gpid": 3326
 },
 { "name": "Type 2 KA-MI (without pontoons)",
  "type": "aLT",
  "CS#": "5\u2020",
  "note_number": "6\u2020",
-  "_id_": "ja/v:008",
-  "_gpid_": 3324
+  "id": "ja/v:008",
+  "gpid": 3324
 },
 { "name": "Type 89A CHI-RO",
  "type": "MT",
@ -81,16 +81,16 @@
  "CS#": 4,
  "note_number": "7\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ja/v:009",
-  "_gpid_": 3329
+  "id": "ja/v:009",
+  "gpid": 3329
 },
 { "name": "Type 89B CHI-RO",
  "type": "MT",
  "no_radio": "\u00ae",
  "CS#": 4,
  "note_number": "7\u2020",
-  "_id_": "ja/v:010",
-  "_gpid_": 3331
+  "id": "ja/v:010",
+  "gpid": 3331
 },
 { "name": "Type 97A CHI-HA",
  "type": "MT",
@ -99,48 +99,48 @@
  "capabilities2": { "sD": [ [5,"1+"], "\u2020<sup>1</sup>" ] },
  "note_number": "8\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "C\u2020<sup>2</sup>" ],
-  "_id_": "ja/v:011",
-  "_gpid_": 3333
+  "id": "ja/v:011",
+  "gpid": 3333
 },
 { "name": "Type 97B CHI-HA",
  "type": "MT",
  "CS#": 4,
  "capabilities2": { "sD": 5 },
  "note_number": "8\u2020",
-  "_id_": "ja/v:012",
-  "_gpid_": 3335
+  "id": "ja/v:012",
+  "gpid": 3335
 },
 { "name": "Type 1 CHI-HE",
  "type": "MT",
  "CS#": 5,
  "capabilities2": { "sD": 5 },
  "note_number": "9\u2020",
-  "_id_": "ja/v:013",
-  "_gpid_": 3337
+  "id": "ja/v:013",
+  "gpid": 3337
 },
 { "name": "Type 91",
  "type": "AC",
  "CS#": 6,
  "note_number": "10\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ja/v:014",
-  "_gpid_": [ 3341, 3343, 3345 ]
+  "id": "ja/v:014",
+  "gpid": [ 3341, 3343, 3345 ]
 },
 { "name": "Type 92",
  "type": "AC",
  "CS#": 4,
  "note_number": "11\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ja/v:015",
-  "_gpid_": [ 3347, 3349 ]
+  "id": "ja/v:015",
+  "gpid": [ 3347, 3349 ]
 },
 { "name": "Type 1 HO-NI I",
  "type": "SPA",
  "CS#": 5,
  "capabilities2": { "WP": 5 },
  "note_number": "12\u2020",
-  "_id_": "ja/v:016",
-  "_gpid_": 3353
+  "id": "ja/v:016",
+  "gpid": 3353
 },
 { "name": "Type 4 HO-RO",
  "type": "SPA",
@ -148,55 +148,55 @@
  "no_if": true,
  "capabilities2": { "WP": 6 },
  "note_number": "13\u2020",
-  "_id_": "ja/v:017",
-  "_gpid_": 3355
+  "id": "ja/v:017",
+  "gpid": 3355
 },
 { "name": "Type 1 HO-KI",
  "type": "APC",
  "cs#": 5,
  "note_number": "14\u2020",
-  "_id_": "ja/v:018",
-  "_gpid_": 3357
+  "id": "ja/v:018",
+  "gpid": 3357
 },
 { "name": "Type 98 SHI-KE",
  "type": "PC",
  "cs#": 5,
  "note_number": "15\u2020",
-  "_id_": "ja/v:019",
-  "_gpid_": 3359
+  "id": "ja/v:019",
+  "gpid": 3359
 },
 { "name": "Type 92 I-KE",
  "type": "PC",
  "cs#": 5,
  "note_number": "16\u2020",
-  "_id_": "ja/v:020",
-  "_gpid_": 3361
+  "id": "ja/v:020",
+  "gpid": 3361
 },
 { "name": "Type 95",
  "type": "tr",
  "cs#": 2,
  "note_number": "17\u2020",
-  "_id_": "ja/v:021",
-  "_gpid_": 3363
+  "id": "ja/v:021",
+  "gpid": 3363
 },
 { "name": "Type 94",
  "type": "tr",
  "cs#": 6,
  "note_number": "18",
-  "_id_": "ja/v:022",
-  "_gpid_": 3364
+  "id": "ja/v:022",
+  "gpid": 3364
 },
 { "name": "Type 97",
  "type": "tr",
  "cs#": 7,
  "note_number": "18",
-  "_id_": "ja/v:023",
-  "_gpid_": 3366
+  "id": "ja/v:023",
+  "gpid": 3366
 },
 { "name": "Vickers 8-in. Costal Defense Gun Turret",
  "note_number": "19\u2020",
-  "_id_": "ja/v:024",
-  "_gpid_": null
+  "id": "ja/v:024",
+  "gpid": null
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/landing-craft.json
+++ b/vasl_templates/webapp/data/vehicles/landing-craft.json
@ -5,70 +5,70 @@
  "damage_points": 2,
  "note_number": "1\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "B\u2020<sup>3</sup>", "C\u2020<sup>2</sup>", "D" ],
-  "_id_": "sh/v:000",
-  "_gpid_": [ 399, 397 ]
+  "id": "sh/v:000",
+  "gpid": [ 399, 397 ]
 },
 { "name": "LCA",
  "CS#": 6,
  "damage_points": 3,
  "note_number": "2\u2020",
-  "_id_": "sh/v:001",
-  "_gpid_": 401
+  "id": "sh/v:001",
+  "gpid": 401
 },
 { "name": "LCVP",
  "CS#": 5,
  "damage_points": 3,
  "note_number": "3\u2020",
  "notes": [ "B\u2020<sup>2</sup>", "C\u2020<sup>1</sup>" ],
-  "_id_": "sh/v:002",
-  "_gpid_": [ 403, 405 ]
+  "id": "sh/v:002",
+  "gpid": [ 403, 405 ]
 },
 { "name": "LCV",
  "CS#": 5,
  "damage_points": 3,
  "note_number": "3\u2020",
-  "_id_": "sh/v:003",
-  "_gpid_": null
+  "id": "sh/v:003",
+  "gpid": null
 },
 { "name": "LCM(3)",
  "CS#": 6,
  "damage_points": 5,
  "note_number": "4\u2020",
  "notes": [ "B\u2020<sup>2</sup>", "C\u2020<sup>1</sup>" ],
-  "_id_": "sh/v:004",
-  "_gpid_": [ 407, 409 ]
+  "id": "sh/v:004",
+  "gpid": [ 407, 409 ]
 },
 { "name": "LCI(S)",
  "CS#": 10,
  "damage_points": 14,
  "note_number": "5\u2020",
  "notes": [ "C\u2020<sup>3</sup>", "D", "E\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G" ],
-  "_id_": "sh/v:005",
-  "_gpid_": 411
+  "id": "sh/v:005",
+  "gpid": 411
 },
 { "name": "LCT(4)",
  "CS#": 9,
  "damage_points": 10,
  "note_number": "6\u2020",
  "notes": [ "C\u2020<sup>3</sup>", "E\u2020<sup>2</sup>", "F\u2020<sup>1</sup>", "G" ],
-  "_id_": "sh/v:006",
-  "_gpid_": [ 413, 415 ]
+  "id": "sh/v:006",
+  "gpid": [ 413, 415 ]
 },
 { "name": "Daihatsu",
  "CS#": 4,
  "damage_points": 3,
  "note_number": "7\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "sh/v:007",
-  "_gpid_": 417
+  "id": "sh/v:007",
+  "gpid": 417
 },
 { "name": "Shohatsu",
  "CS#": 3,
  "damage_points": 2,
  "note_number": "8\u2020",
  "notes": [ "A\u2020", "D" ],
-  "_id_": "sh/v:008",
-  "_gpid_": 419
+  "id": "sh/v:008",
+  "gpid": 419
 }

 ]
--- a/vasl_templates/webapp/data/vehicles/russian.json
+++ b/vasl_templates/webapp/data/vehicles/russian.json
@ -6,8 +6,8 @@
  "CS#": 2,
  "note_number": "1",
  "notes": [ "H\u2020", "M" ],
-  "_id_": "ru/v:000",
-  "_gpid_": 541
+  "id": "ru/v:000",
+  "gpid": 541
 },
 { "name": "T-27",
  "type": "Tt",
@ -15,8 +15,8 @@
  "CS#": 2,
  "note_number": "1.1\u2020",
  "notes": [ "M", "Q" ],
-  "_id_": "ru/v:001",
-  "_gpid_": 7032
+  "id": "ru/v:001",
+  "gpid": 7032
 },
 { "name": "T-40",
  "type": "aTt",
@ -24,8 +24,8 @@
  "CS#": 2,
  "note_number": "2\u2020",
  "notes": [ "H\u2020" ],
-  "_id_": "ru/v:002",
-  "_gpid_": 543
+  "id": "ru/v:002",
+  "gpid": 543
 },
 { "name": "T-50",
  "type": "Tt",
@ -33,16 +33,16 @@
  "CS#": 4,
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "3",
-  "_id_": "ru/v:003",
-  "_gpid_": 545
+  "id": "ru/v:003",
+  "gpid": 545
 },
 { "name": "T-60 M40",
  "type": "Tt",
  "no_radio": "\u00ae",
  "CS#": 2,
  "note_number": "4",
-  "_id_": "ru/v:004",
-  "_gpid_": 547
+  "id": "ru/v:004",
+  "gpid": 547
 },
 { "name": "T-60 M42",
  "type": "Tt",
@ -50,8 +50,8 @@
  "CS#": 2,
  "note_number": "4",
  "notes": [ "C\u2020" ],
-  "_id_": "ru/v:005",
-  "_gpid_": 549
+  "id": "ru/v:005",
+  "gpid": 549
 },
 { "name": "T-70",
  "type": "Tt",
@ -60,8 +60,8 @@
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "5",
  "notes": [ "C\u2020" ],
-  "_id_": "ru/v:006",
-  "_gpid_": 551
+  "id": "ru/v:006",
+  "gpid": 551
 },
 { "name": "T-26 M33",
  "type": "LT",
@ -69,8 +69,8 @@
  "CS#": 3,
  "note_number": "6",
  "notes": [ "D", "I\u2020", "M", "P" ],
-  "_id_": "ru/v:007",
-  "_gpid_": [ 553, 555, 557, 559, 561 ]
+  "id": "ru/v:007",
+  "gpid": [ 553, 555, 557, 559, 561 ]
 },
 { "name": "T-26 M37/39",
  "type": "LT",
@ -78,8 +78,8 @@
  "CS#": 3,
  "note_number": "6",
  "notes": [ "D", "M", "P" ],
-  "_id_": "ru/v:008",
-  "_gpid_": [ 563, 565, 567, 569 ]
+  "id": "ru/v:008",
+  "gpid": [ 563, 565, 567, 569 ]
 },
 { "name": "T-26 M31",
  "type": "LT",
@ -87,8 +87,8 @@
  "CS#": 3,
  "note_number": "6.1\u2020",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:009",
-  "_gpid_": 7036
+  "id": "ru/v:009",
+  "gpid": 7036
 },
 { "name": "T-26 M32",
  "type": "LT",
@ -96,8 +96,8 @@
  "CS#": 3,
  "note_number": "6.2\u2020",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:010",
-  "_gpid_": 7040
+  "id": "ru/v:010",
+  "gpid": 7040
 },
 { "name": "OT-26",
  "type": "LTv",
@ -105,16 +105,16 @@
  "CS#": "3:brewup",
  "note_number": "6.3\u2020",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:011",
-  "_gpid_": 7042
+  "id": "ru/v:011",
+  "gpid": 7042
 },
 { "name": "ST-26 Bridgelayer",
  "type": "LTv",
  "CS#": 3,
  "note_number": "6.4\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:012",
-  "_gpid_": 7048
+  "id": "ru/v:012",
+  "gpid": 7048
 },
 { "name": "OT-133",
  "type": "LTv",
@ -122,8 +122,8 @@
  "CS#": 3,
  "note_number": "7\u2020",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:013",
-  "_gpid_": 571
+  "id": "ru/v:013",
+  "gpid": 571
 },
 { "name": "BT-2A",
  "type": "LT",
@ -131,8 +131,8 @@
  "CS#": 3,
  "note_number": "7.1\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:014",
-  "_gpid_": 573
+  "id": "ru/v:014",
+  "gpid": 573
 },
 { "name": "BT-5 M34",
  "type": "LT",
@ -140,8 +140,8 @@
  "CS#": 3,
  "note_number": "8\u2020",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:015",
-  "_gpid_": 575
+  "id": "ru/v:015",
+  "gpid": 575
 },
 { "name": "BT-7 M37",
  "type": "LT",
@ -149,8 +149,8 @@
  "CS#": 3,
  "note_number": "9",
  "notes": [ "D", "I\u2020", "M", "P" ],
-  "_id_": "ru/v:016",
-  "_gpid_": [ 577, 579, 581, 583 ]
+  "id": "ru/v:016",
+  "gpid": [ 577, 579, 581, 583 ]
 },
 { "name": "BT-7A",
  "type": "LT",
@ -158,8 +158,8 @@
  "capabilities2": { "AP": 7, "s": 9 },
  "note_number": "10",
  "notes": [ "M", "P" ],
-  "_id_": "ru/v:017",
-  "_gpid_": 585
+  "id": "ru/v:017",
+  "gpid": 585
 },
 { "name": "T-28 M34",
  "type": "MT",
@ -168,8 +168,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "11\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:018",
-  "_gpid_": 587
+  "id": "ru/v:018",
+  "gpid": 587
 },
 { "name": "T-28 M34(L)",
  "type": "MT",
@ -178,8 +178,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "11.1\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:019",
-  "_gpid_": 7418
+  "id": "ru/v:019",
+  "gpid": 7418
 },
 { "name": "T-28E M40",
  "type": "MT",
@ -188,8 +188,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "12\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:020",
-  "_gpid_": 589
+  "id": "ru/v:020",
+  "gpid": 589
 },
 { "name": "T-28E M40(L)",
  "type": "MT",
@ -198,8 +198,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "12.1\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:021",
-  "_gpid_": 7420
+  "id": "ru/v:021",
+  "gpid": 7420
 },
 { "name": "T-34 M40",
  "type": "MT",
@ -207,8 +207,8 @@
  "CS#": 5,
  "note_number": "13",
  "notes": [ "M" ],
-  "_id_": "ru/v:022",
-  "_gpid_": 591
+  "id": "ru/v:022",
+  "gpid": 591
 },
 { "name": "T-34 M41",
  "type": "MT",
@ -217,8 +217,8 @@
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "14\u2020",
  "notes": [ "C\u2020", "M" ],
-  "_id_": "ru/v:023",
-  "_gpid_": 593
+  "id": "ru/v:023",
+  "gpid": 593
 },
 { "name": "OT-34",
  "type": "MTv",
@ -228,16 +228,16 @@
  "capabilities2": { "A": [ [2,2] ], "AP": 7 },
  "note_number": "15\u2020",
  "notes": [ "C\u2020", "M" ],
-  "_id_": "ru/v:024",
-  "_gpid_": 595
+  "id": "ru/v:024",
+  "gpid": 595
 },
 { "name": "T-34 M43",
  "type": "MT",
  "CS#": 5,
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "16\u2020",
-  "_id_": "ru/v:025",
-  "_gpid_": 597
+  "id": "ru/v:025",
+  "gpid": 597
 },
 { "name": "T-43",
  "type": "MT",
@ -246,8 +246,8 @@
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "17",
  "notes": [ "C\u2020", "M" ],
-  "_id_": "ru/v:026",
-  "_gpid_": 599
+  "id": "ru/v:026",
+  "gpid": 599
 },
 { "name": "T-34/85",
  "type": "MT",
@ -255,8 +255,8 @@
  "capabilities2": { "A": [ [5,4] ], "sD": "6\u2020" },
  "note_number": "18\u2020",
  "notes": [ "J\u2020" ],
-  "_id_": "ru/v:027",
-  "_gpid_": 601
+  "id": "ru/v:027",
+  "gpid": 601
 },
 { "name": "M4/76(a)",
  "type": "MT",
@ -264,8 +264,8 @@
  "capabilities2": { "A": [ [3,4] ], "s": 8, "sM": 8 },
  "note_number": "19\u2020",
  "notes": [ "N" ],
-  "_id_": "ru/v:028",
-  "_gpid_": 603
+  "id": "ru/v:028",
+  "gpid": 603
 },
 { "name": "T-44",
  "type": "MT",
@ -273,8 +273,8 @@
  "capabilities2": { "A": [ [6,5] ] },
  "note_number": "20",
  "notes": [ "B\u2020", "M" ],
-  "_id_": "ru/v:029",
-  "_gpid_": 605
+  "id": "ru/v:029",
+  "gpid": 605
 },
 { "name": "T-35",
  "type": "HT",
@ -283,40 +283,40 @@
  "capabilities2": { "s": 9 },
  "note_number": "21\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:030",
-  "_gpid_": 607
+  "id": "ru/v:030",
+  "gpid": 607
 },
 { "name": "SMK",
  "type": "HT",
  "CS#": 7,
  "note_number": "21.1",
  "notes": [ "M", "T\u2020" ],
-  "_id_": "ru/v:031",
-  "_gpid_": 7056
+  "id": "ru/v:031",
+  "gpid": 7056
 },
 { "name": "T-100",
  "type": "HT",
  "CS#": 7,
  "note_number": "22.1",
  "notes": [ "M", "T\u2020" ],
-  "_id_": "ru/v:032",
-  "_gpid_": 7060
+  "id": "ru/v:032",
+  "gpid": 7060
 },
 { "name": "KV-1 M39/40",
  "type": "HT",
  "CS#": 6,
  "note_number": "22\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:033",
-  "_gpid_": 609
+  "id": "ru/v:033",
+  "gpid": 609
 },
 { "name": "KV-1E",
  "type": "HT",
  "CS#": 6,
  "note_number": "23",
  "notes": [ "D", "M" ],
-  "_id_": "ru/v:034",
-  "_gpid_": [ 611, 613 ]
+  "id": "ru/v:034",
+  "gpid": [ 611, 613 ]
 },
 { "name": "KV-1 M41",
  "type": "HT",
@ -324,8 +324,8 @@
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "23",
  "notes": [ "D", "M" ],
-  "_id_": "ru/v:035",
-  "_gpid_": [ 615, 617 ]
+  "id": "ru/v:035",
+  "gpid": [ 615, 617 ]
 },
 { "name": "KV-1 M42",
  "type": "HT",
@ -333,8 +333,8 @@
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "23",
  "notes": [ "D", "M" ],
-  "_id_": "ru/v:036",
-  "_gpid_": [ 619, 621 ]
+  "id": "ru/v:036",
+  "gpid": [ 619, 621 ]
 },
 { "name": "KV-2",
  "type": "HT",
@ -343,8 +343,8 @@
  "capabilities2": { "AP": 9 },
  "note_number": "24\u2020",
  "notes": [ "M" ],
-  "_id_": "ru/v:037",
-  "_gpid_": 623
+  "id": "ru/v:037",
+  "gpid": 623
 },
 { "name": "KV-8",
  "type": "HTv",
@ -352,16 +352,16 @@
  "capabilities2": { "A": [ [4,2] ], "AP": 7 },
  "note_number": "15\u2020",
  "notes": [ "D", "M" ],
-  "_id_": "ru/v:038",
-  "_gpid_": [ 625, 627 ]
+  "id": "ru/v:038",
+  "gpid": [ 625, 627 ]
 },
 { "name": "KV-1S",
  "type": "HT",
  "CS#": 6,
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "25\u2020",
-  "_id_": "ru/v:039",
-  "_gpid_": 629
+  "id": "ru/v:039",
+  "gpid": 629
 },
 { "name": "KV-85",
  "type": "HT",
@ -369,8 +369,8 @@
  "capabilities2": { "A": [ [4,3], [5,4] ] },
  "note_number": "26",
  "notes": [ "B\u2020" ],
-  "_id_": "ru/v:040",
-  "_gpid_": 631
+  "id": "ru/v:040",
+  "gpid": 631
 },
 { "name": "IS-2",
  "type": "HT",
@ -378,8 +378,8 @@
  "no_if": true,
  "note_number": "27",
  "notes": [ "B\u2020" ],
-  "_id_": "ru/v:041",
-  "_gpid_": 633
+  "id": "ru/v:041",
+  "gpid": 633
 },
 { "name": "IS-2m",
  "type": "HT",
@ -387,8 +387,8 @@
  "no_if": true,
  "note_number": "28",
  "notes": [ "B\u2020", "G\u2020" ],
-  "_id_": "ru/v:042",
-  "_gpid_": [ 635, 637 ]
+  "id": "ru/v:042",
+  "gpid": [ 635, 637 ]
 },
 { "name": "IS-3",
  "type": "HT",
@ -397,16 +397,16 @@
  "capabilities2": { "sD": "6\u2020" },
  "note_number": "29",
  "notes": [ "G\u2020", "J\u2020" ],
-  "_id_": "ru/v:043",
-  "_gpid_": [ 639, 641 ]
+  "id": "ru/v:043",
+  "gpid": [ 639, 641 ]
 },
 { "name": "SU-76M",
  "type": "AG",
  "CS#": "4:brewup",
  "capabilities2": { "A": [ [5,3] ] },
  "note_number": "30\u2020",
-  "_id_": "ru/v:044",
-  "_gpid_": 645
+  "id": "ru/v:044",
+  "gpid": 645
 },
 { "name": "SU-76i(g)",
  "type": "AG",
@ -414,8 +414,8 @@
  "capabilities2": { "A": [ [5,3] ] },
  "note_number": "31",
  "notes": [ "K" ],
-  "_id_": "ru/v:045",
-  "_gpid_": 647
+  "id": "ru/v:045",
+  "gpid": 647
 },
 { "name": "SU-122",
  "type": "AG",
@ -423,16 +423,16 @@
  "no_if": true,
  "capabilities2": { "H": 9, "s": 8 },
  "note_number": "32",
-  "_id_": "ru/v:046",
-  "_gpid_": 649
+  "id": "ru/v:046",
+  "gpid": 649
 },
 { "name": "SU-152",
  "type": "AG",
  "CS#": 6,
  "no_if": true,
  "note_number": "33\u2020",
-  "_id_": "ru/v:047",
-  "_gpid_": 651
+  "id": "ru/v:047",
+  "gpid": 651
 },
 { "name": "ISU-122",
  "type": "AG",
@ -441,8 +441,8 @@
  "capabilities2": { "s": 8 },
  "note_number": "34",
  "notes": [ "G\u2020" ],
-  "_id_": "ru/v:048",
-  "_gpid_": [ 653, 655 ]
+  "id": "ru/v:048",
+  "gpid": [ 653, 655 ]
 },
 { "name": "ISU-152",
  "type": "AG",
@ -450,24 +450,24 @@
  "no_if": true,
  "note_number": "34",
  "notes": [ "G\u2020" ],
-  "_id_": "ru/v:049",
-  "_gpid_": [ 657, 659 ]
+  "id": "ru/v:049",
+  "gpid": [ 657, 659 ]
 },
 { "name": "SU-85",
  "type": "TD",
  "CS#": 5,
  "capabilities2": { "A": [ [5,3] ], "HE": 7, "s": 7 },
  "note_number": "35",
-  "_id_": "ru/v:050",
-  "_gpid_": 661
+  "id": "ru/v:050",
+  "gpid": 661
 },
 { "name": "SU-100",
  "type": "TD",
  "CS#": 5,
  "capabilities2": { "HE": 7 },
  "note_number": "36",
-  "_id_": "ru/v:051",
-  "_gpid_": 663
+  "id": "ru/v:051",
+  "gpid": 663
 },
 { "name": "SU-57(a)",
  "type": "TDht",
@ -475,16 +475,16 @@
  "capabilities2": { "A": [ [5,3] ], "HE": 7 },
  "note_number": "37",
  "notes": [ "K" ],
-  "_id_": "ru/v:052",
-  "_gpid_": 665
+  "id": "ru/v:052",
+  "gpid": 665
 },
 { "name": "BA-20",
  "type": "AC",
  "no_radio": "\u00ae",
  "CS#": 3,
  "note_number": "38",
-  "_id_": "ru/v:053",
-  "_gpid_": 669
+  "id": "ru/v:053",
+  "gpid": 669
 },
 { "name": "BA-6",
  "type": "AC",
@ -492,24 +492,24 @@
  "CS#": 4,
  "capabilities2": { "A": [ [4,2] ] },
  "note_number": "39",
-  "_id_": "ru/v:054",
-  "_gpid_": 671
+  "id": "ru/v:054",
+  "gpid": 671
 },
 { "name": "BA-64B",
  "type": "AC",
  "CS#": 2,
  "note_number": "40\u2020",
  "notes": [ "A\u2020" ],
-  "_id_": "ru/v:055",
-  "_gpid_": 673
+  "id": "ru/v:055",
+  "gpid": 673
 },
 { "name": "ZSU-37",
  "type": "SPAA",
  "CS#": 4,
  "note_number": "41\u2020",
  "notes": [ "A\u2020" ],
-  "_id_": "ru/v:056",
-  "_gpid_": 677
+  "id": "ru/v:056",
+  "gpid": 677
 },
 { "name": "SU-12",
  "type": "SPAtr",
@ -517,24 +517,24 @@
  "capabilities2": { "AP": 7, "s": 8 },
  "note_number": "42",
  "notes": [ "F\u2020" ],
-  "_id_": "ru/v:057",
-  "_gpid_": 679
+  "id": "ru/v:057",
+  "gpid": 679
 },
 { "name": "GAZ-4M-AA",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "43\u2020",
  "notes": [ "A\u2020" ],
-  "_id_": "ru/v:058",
-  "_gpid_": 681
+  "id": "ru/v:058",
+  "gpid": 681
 },
 { "name": "ZIS-42-AA",
  "type": "AAtr",
  "CS#": 4,
  "note_number": "44",
  "notes": [ "A\u2020", "F\u2020" ],
-  "_id_": "ru/v:059",
-  "_gpid_": 683
+  "id": "ru/v:059",
+  "gpid": 683
 },
 { "name": "LANO AT",
  "type": "TDtr",
@ -542,8 +542,8 @@
  "CS#": 5,
  "capabilities2": { "A": [ [4,"2+"] ] },
  "note_number": "44.1",
-  "_id_": "ru/v:060",
-  "_gpid_": 7064
+  "id": "ru/v:060",
+  "gpid": 7064
 },
 { "name": "LANO AA",
  "type": "AAtr",
@ -551,8 +551,8 @@
  "CS#": 5,
  "note_number": "44.2\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:061",
-  "_gpid_": 7068
+  "id": "ru/v:061",
+  "gpid": 7068
 },
 { "name": "IAG-10-AA",
  "type": "AAtr",
@ -560,90 +560,90 @@
  "capabilities2": { "AP": 7 },
  "note_number": "45",
  "notes": [ "A\u2020", "F\u2020" ],
-  "_id_": "ru/v:062",
-  "_gpid_": 685
+  "id": "ru/v:062",
+  "gpid": 685
 },
 { "name": "GAZ-67B",
  "type": "tr",
  "CS#": 2,
  "note_number": "46",
  "notes": [ "L\u2020" ],
-  "_id_": "ru/v:063",
-  "_gpid_": 693
+  "id": "ru/v:063",
+  "gpid": 693
 },
 { "name": "Komsomolet",
  "type": "APC",
  "CS#": "2\u2020",
  "note_number": "46.1\u2020",
-  "_id_": "ru/v:064",
-  "_gpid_": 687
+  "id": "ru/v:064",
+  "gpid": 687
 },
 { "name": "STZ-3",
  "type": "PC",
  "cs#": 4,
  "note_number": "46.2",
-  "_id_": "ru/v:065",
-  "_gpid_": 7072
+  "id": "ru/v:065",
+  "gpid": 7072
 },
 { "name": "STZ-5",
  "type": "PC",
  "cs#": 7,
  "note_number": "46.3",
-  "_id_": "ru/v:066",
-  "_gpid_": 7078
+  "id": "ru/v:066",
+  "gpid": 7078
 },
 { "name": "GAZ-MM",
  "type": "tr",
  "cs#": 6,
  "note_number": "47",
-  "_id_": "ru/v:067",
-  "_gpid_": 694
+  "id": "ru/v:067",
+  "gpid": 694
 },
 { "name": "ZIS-5",
  "type": "tr",
  "cs#": 7,
  "note_number": "47",
-  "_id_": "ru/v:068",
-  "_gpid_": 696
+  "id": "ru/v:068",
+  "gpid": 696
 },
 { "name": "IAG-6",
  "type": "tr",
  "cs#": 7,
  "note_number": "47",
-  "_id_": "ru/v:069",
-  "_gpid_": 698
+  "id": "ru/v:069",
+  "gpid": 698
 },
 { "name": "NKL-6",
  "type": "AS",
  "CS#": "2\u2020",
  "note_number": "47.1\u2020",
  "notes": [ "S\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:070",
-  "_gpid_": 7082
+  "id": "ru/v:070",
+  "gpid": 7082
 },
 { "name": "NKL-16",
  "type": "AS",
  "cs#": 2,
  "note_number": "47.1\u2020",
  "notes": [ "S\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:071",
-  "_gpid_": 7084
+  "id": "ru/v:071",
+  "gpid": 7084
 },
 { "name": "NKL-26",
  "type": "AS",
  "CS#": 2,
  "note_number": "47.2\u2020",
  "notes": [ "Q", "S\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:072",
-  "_gpid_": 7085
+  "id": "ru/v:072",
+  "gpid": 7085
 },
 { "name": "RF-8-GAZ-98",
  "type": "AS",
  "CS#": 3,
  "note_number": "47.3\u2020",
  "notes": [ "S\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:073",
-  "_gpid_": 7089
+  "id": "ru/v:073",
+  "gpid": 7089
 },
 { "name": "Stuart III(a)",
  "type": "LT",
@ -651,8 +651,8 @@
  "capabilities2": { "C": 6 },
  "note_number": "48",
  "notes": [ "N", "O", "LL" ],
-  "_id_": "ru/v:074",
-  "_gpid_": [ 6362, 6364 ]
+  "id": "ru/v:074",
+  "gpid": [ 6362, 6364 ]
 },
 { "name": "Lee(a)",
  "type": "MT",
@ -660,8 +660,8 @@
  "capabilities2": { "C": "4\u2020", "s": "8\u2020" },
  "note_number": "49\u2020",
  "notes": [ "B\u2020<sup>1</sup>", "N", "O", "LL" ],
-  "_id_": "ru/v:075",
-  "_gpid_": [ 704, 706, 7423 ]
+  "id": "ru/v:075",
+  "gpid": [ 704, 706, 7423 ]
 },
 { "name": "Sherman III(a)",
  "type": "MT",
@ -669,8 +669,8 @@
  "capabilities2": { "s": 8, "WP": [ [6,"J4+"], "\u2020" ] },
  "note_number": "50\u2020",
  "notes": [ "N", "O", "R\u2020<sup>1</sup>", "LL" ],
-  "_id_": "ru/v:076",
-  "_gpid_": [ 708, 710, 7091 ]
+  "id": "ru/v:076",
+  "gpid": [ 708, 710, 7091 ]
 },
 { "name": "Sherman III(L)(a)",
  "type": "MT",
@ -678,8 +678,8 @@
  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
  "note_number": "50.1",
  "notes": [ "N", "O", "R\u2020", "LL" ],
-  "_id_": "ru/v:077",
-  "_gpid_": [ 712, 714 ]
+  "id": "ru/v:077",
+  "gpid": [ 712, 714 ]
 },
 { "name": "Matilda II(b)",
  "type": "HT",
@ -687,8 +687,8 @@
  "capabilities2": { "sD": 6 },
  "note_number": "51\u2020",
  "notes": [ "M\u2020<sup>1</sup>", "N", "LL" ],
-  "_id_": "ru/v:078",
-  "_gpid_": null
+  "id": "ru/v:078",
+  "gpid": null
 },
 { "name": "Valentine V(b)",
  "type": "HT",
@ -696,8 +696,8 @@
  "capabilities2": { "sM": 8 },
  "note_number": "52.1",
  "notes": [ "N", "LL" ],
-  "_id_": "ru/v:079",
-  "_gpid_": null
+  "id": "ru/v:079",
+  "gpid": null
 },
 { "name": "Valentine VIII(b)",
  "type": "HT",
@ -705,8 +705,8 @@
  "capabilities2": { "HE": 7, "sD": 6 },
  "note_number": "52.2",
  "notes": [ "N", "LL" ],
-  "_id_": "ru/v:080",
-  "_gpid_": null
+  "id": "ru/v:080",
+  "gpid": null
 },
 { "name": "Churchill III(b)",
  "type": "HT",
@ -714,31 +714,31 @@
  "capabilities2": { "D": [ [6,"J4"], [7,5], "\u2020" ], "HE": [ [7,"F3"], [8,"4+"], "\u2020" ], "sD": [ [6,"4+"] ], "sM": "8\u2020" },
  "note_number": "53\u2020",
  "notes": [ "N", "LL" ],
-  "_id_": "ru/v:081",
-  "_gpid_": null
+  "id": "ru/v:081",
+  "gpid": null
 },
 { "name": "M3A1 Scout Car(a)",
  "type": "APC",
  "CS#": 4,
  "note_number": "54\u2020",
  "notes": [ "N", "LL" ],
-  "_id_": "ru/v:082",
-  "_gpid_": null
+  "id": "ru/v:082",
+  "gpid": null
 },
 { "name": "Jeep GPA(a)",
  "type": "atr",
  "cs#": 2,
  "note_number": "59",
  "notes": [ "H\u2020", "L\u2020<sup>1</sup>" ],
-  "_id_": "ru/v:083",
-  "_gpid_": 7119
+  "id": "ru/v:083",
+  "gpid": 7119
 },
 { "name": "DUKW(a)",
  "type": "atr",
  "cs#": 7,
  "note_number": "60\u2020",
-  "_id_": "ru/v:084",
-  "_gpid_": 7120
+  "id": "ru/v:084",
+  "gpid": 7120
 }

 ]
--- a/vasl_templates/webapp/file_server/utils.py
+++ b/vasl_templates/webapp/file_server/utils.py
@ -17,10 +17,10 @@ def get_vo_gpids( data_dir ):
                    continue
                entries = json.load( open( os.path.join(root,fname), "r" ) )
                for entry in entries:
-                    if isinstance( entry["_gpid_"], list):
-                        gpids.update( entry["_gpid_"] )
+                    if isinstance( entry["gpid"], list):
+                        gpids.update( entry["gpid"] )
                    else:
-                        gpids.add( entry["_gpid_"] )
+                        gpids.add( entry["gpid"] )
    gpids.remove( None )

    return gpids
--- a/vasl_templates/webapp/static/vo.js
+++ b/vasl_templates/webapp/static/vo.js
@ -8,7 +8,7 @@ function add_vo( vo_type, player_no )
    var vo_present = [];
    $sortable2.children("li").each( function() {
        var vo_entry = $(this).data( "sortable2-data" ).vo_entry ;
-        vo_present.push( vo_entry._id_ ) ;
+        vo_present.push( vo_entry.id ) ;
    } ) ;

    // load the available vehicles/ordnance
@ -20,7 +20,7 @@ function add_vo( vo_type, player_no )
    }
    var buf = [] ;
    for ( var i=0 ; i < entries.length ; ++i ) {
-        if ( vo_present.indexOf( entries[i]._id_ ) !== -1 )
+        if ( vo_present.indexOf( entries[i].id ) !== -1 )
            continue ;
        buf.push( "<option value='" + i + "'>" + entries[i].name + "</option>" ) ;
    }
@ -137,16 +137,16 @@ function find_vo( vo_type, nat, name )

 function _get_vo_image_url( vo_entry )
 {
-    if ( $.isArray( vo_entry._gpid_ ) ) // FIXME! if > 1 image available, let the user pick which one
-        return "/counter/" + vo_entry._gpid_[0] + "/front" ;
-    if ( vo_entry._gpid_ )
-        return "/counter/" + vo_entry._gpid_ + "/front" ;
+    if ( $.isArray( vo_entry.gpid ) ) // FIXME! if > 1 image available, let the user pick which one
+        return "/counter/" + vo_entry.gpid[0] + "/front" ;
+    if ( vo_entry.gpid )
+        return "/counter/" + vo_entry.gpid + "/front" ;
    return gImagesBaseUrl + "/missing-image.png" ;
 }

 function is_small_vasl_piece( vo_entry )
 {
-    var gpid = vo_entry._gpid_ ;
+    var gpid = vo_entry.gpid ;
    if ( $.isArray( gpid ) ) // FIXME! if > 1 image available, need to be smarter here
        gpid = gpid[0] ;
    if ( !( gpid in gVaslPieceInfo ) )
--- a/vasl_templates/webapp/tests/fixtures/data/ordnance/american.json
+++ b/vasl_templates/webapp/tests/fixtures/data/ordnance/american.json
@ -5,7 +5,7 @@
  "capabilities2": { "H": 6, "s": 7, "WP": 8, "C": [ [7,"4+P"], "\u2020<sup>1</sup>" ] },
  "note_number": "14\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/o:013"
+  "id": "am/o:013"
 },

 { "name": "M3 105mm Howitzer",
@ -13,7 +13,7 @@
  "capabilities2": { "H": 7, "s": 7, "WP": 8, "C": [ [7,"P"], "\u2020<sup>1</sup>" ] },
  "note_number": "15\u2020",
  "notes": [ "C\u2020<sup>1</sup>" ],
-  "_id_": "am/o:014"
+  "id": "am/o:014"
 },

 { "name": "M3A1 37mm AT Gun",
@ -21,14 +21,14 @@
  "capabilities2": { "C": [ [7,"A2+"], "\u2020<sup>1</sup>" ] },
  "note_number": "6\u2020",
  "notes": [ "C\u2020<sup>1</sup>", "N" ],
-  "_id_": "am/o:005"
+  "id": "am/o:005"
 },

 { "name": "M1 57mm AT Gun",
  "capabilities": [ "NT", "QSU" ],
  "capabilities2": { "HE": [ [7,"J4E"], [7,5], "\u2020" ], "D": [ [4,"J4+E"], "\u2020" ] },
  "note_number": "7\u2020",
-  "_id_": "am/o:006"
+  "id": "am/o:006"
 }

 ]
--- a/vasl_templates/webapp/tests/fixtures/data/ordnance/german.json
+++ b/vasl_templates/webapp/tests/fixtures/data/ordnance/german.json
@ -6,15 +6,15 @@
  "capabilities_other": [ "can do other stuff" ],
  "note_number": "1",
  "notes": [ "A", "B\u2020" ],
-  "_id_": "ge/o:990"
+  "id": "ge/o:990"
 },
 { "name": "another german ordnance",
  "capabilities": [ "QSU" ],
  "note_number": "2",
-  "_id_": "ge/o:991"
+  "id": "ge/o:991"
 },
 { "name": "name only",
-  "_id_": "ge/o:992"
+  "id": "ge/o:992"
 }

 ]
--- a/vasl_templates/webapp/tests/fixtures/data/ordnance/russian.json
+++ b/vasl_templates/webapp/tests/fixtures/data/ordnance/russian.json
@ -6,15 +6,15 @@
  "capabilities_other": [ "twerking" ],
  "note_number": "1",
  "notes": [ "X", "Y\u2020" ],
-  "_id_": "ru/o:990"
+  "id": "ru/o:990"
 },
 { "name": "another russian ordnance",
  "capabilities": [ "RFNM" ],
  "note_number": "2",
-  "_id_": "ru/o:991"
+  "id": "ru/o:991"
 },
 { "name": "name only",
-  "_id_": "ru/o:992"
+  "id": "ru/o:992"
 }

 ]
--- a/vasl_templates/webapp/tests/fixtures/data/vehicles/american.json
+++ b/vasl_templates/webapp/tests/fixtures/data/vehicles/american.json
@ -5,14 +5,14 @@
  "capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
  "note_number": "23\u2020",
  "notes": [ "A\u2020<sup>1</sup>", "N", "Y" ],
-  "_id_": "am/v:024"
+  "id": "am/v:024"
 },
 { "name": "M18 GMC",
  "CS#": 6,
  "capabilities2": { "A": [ [5,"4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
  "note_number": "24\u2020",
  "notes": [ "A\u2020<sup>1</sup>" ],
-  "_id_": "am/v:025"
+  "id": "am/v:025"
 }

 ]
--- a/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
+++ b/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
@ -7,16 +7,16 @@
  "CS#": 5,
  "note_number": "1",
  "notes": [ "A", "B\u2020" ],
-  "_id_": "ge/v:990"
+  "id": "ge/v:990"
 },
 { "name": "another german vehicle",
  "capabilities": [ "QSU" ],
  "cs#": "4:brewup",
  "note_number": "2",
-  "_id_": "ge/v:991"
+  "id": "ge/v:991"
 },
 { "name": "name only",
-  "_id_": "ge/v:992"
+  "id": "ge/v:992"
 }

 ]
--- a/vasl_templates/webapp/tests/fixtures/data/vehicles/russian.json
+++ b/vasl_templates/webapp/tests/fixtures/data/vehicles/russian.json
@ -7,16 +7,16 @@
  "CS#": 3,
  "note_number": "1",
  "notes": [ "X", "Y\u2020" ],
-  "_id_": "ru/v:990"
+  "id": "ru/v:990"
 },
 { "name": "another russian vehicle",
  "capabilities": [ "RFNM" ],
  "cs#": 4,
  "note_number": "2",
-  "_id_": "ru/v:991"
+  "id": "ru/v:991"
 },
 { "name": "name only",
-  "_id_": "ru/v:992"
+  "id": "ru/v:992"
 },

 { "name": "Churchill III(b)",
@ -24,14 +24,14 @@
  "capabilities2": { "D": [ [6,"J4"], [7,5], "\u2020" ], "HE": [ [7,"F3"], [8,"4+"], "\u2020" ], "sD": [ [6,"4+"] ], "sM": "8\u2020" },
  "note_number": "53\u2020",
  "notes": [ "N", "LL" ],
-  "_id_": "ru/v:081"
+  "id": "ru/v:081"
 },
 { "name": "Sherman III(a)",
  "CS#": "5:brewup",
  "capabilities2": { "s": 8, "WP": [ [6,"J4+"], "\u2020" ] },
  "note_number": "50\u2020",
  "notes": [ "N", "O", "R\u2020<sup>1</sup>", "LL" ],
-  "_id_": "ru/v:076"
+  "id": "ru/v:076"
 }

 ]