diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json
index 402fde0..d2ed6ff 100644
--- a/vasl_templates/webapp/data/default-template-pack/nationalities.json
+++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json
@@ -44,12 +44,17 @@
   "display_name": "Chinese",
   "ob_colors": [ "#d3edfc","#91cdf5", "#e0a22b" ]
 },
+"chinese~gmd": {
+  "display_name": "Chinese GMD",
+  "ob_colors": [ "#d3edfc","#91cdf5", "#e0a22b" ]
+},
 
 "polish": {
   "display_name": "Polish",
-  "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ],
+  "ob_colors": [ "#ecd8b0","#e8cfa4", "#84e8c2" ],
   "type": "allied-minor"
 },
+
 "belgian": {
   "display_name": "Belgian",
   "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ],
@@ -99,6 +104,27 @@
   "display_name": "Bulgarian",
   "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ],
   "type": "axis-minor"
+},
+
+"anzac": {
+  "display_name": "ANZAC",
+  "ob_colors": [ "#f6edda","#e5cea0", "#e5cea0" ]
+},
+"thai": {
+  "display_name": "Thai",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"indonesian": {
+  "display_name": "Indonesian",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"burmese": {
+  "display_name": "Burmese",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"filipino": {
+  "display_name": "Filipino",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
 }
 
 }
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2 b/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
index 7418a2f..4fc8f84 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
@@ -5,6 +5,7 @@
 <style>
 td { margin: 0 ; padding: 0 ; }
 .note { margin-top: 2px ; font-size: 90% ; font-style: italic ; color: #808080 ; }
+.comment { font-size: 90% ; font-style: italic ; color: #404040 ; }
 sup { font-size: 75% ; }
 </style>
 </head>
@@ -28,6 +29,7 @@ sup { font-size: 75% ; }
     <b> {{ord.name}} </b>
     {%if ord.image%} <br> <img src="{{ord.image}}"> {%endif%}
     <div class="note">
+        {%if ord.extn_id%} &#x2756; {%endif%}
         {%if ord.notes%}
             {{ord.note_number}}, {{ord.notes | join(", ")}}
         {%else%}
@@ -35,7 +37,8 @@ sup { font-size: 75% ; }
         {%endif%}
     </div>
 <td valign="top" style="padding:2px 5px;">
-    {%for cap in ord.capabilities%} <div> {{cap}} </div> {%endfor%}
+    {%for cap in ord.capabilities%} <div class="capability"> {{cap}} </div> {%endfor%}
+    {%for cmnt in ord.comments%} <div class="comment"> {{cmnt}} </div> {%endfor%}
 {%endfor%}
 
 </table>
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2 b/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
index 77f675b..5662bb6 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
@@ -4,6 +4,8 @@
 <meta charset="utf-8">
 <style>
 .ma-note .key { font-weight: bold ; }
+.ma-note table { margin-left: 10px ; }
+.ma-note td { padding: 0 ; }
 .extra-notes-caption { border: 1px solid #e0e0e0 ; background: #fcfcfc ; font-weight: bold ; padding: 2px 5px ; }
 ul { margin: 0 0 0 15px ; padding: 0 ; }
 sup { font-size: 75% ; }
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
index f53d4df..fc856d7 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
@@ -5,6 +5,7 @@
 <style>
 td { margin: 0 ; padding: 0 ; }
 .note { margin-top: 2px ; font-size: 90% ; font-style: italic ; color: #808080 ; }
+.comment { font-size: 90% ; font-style: italic ; color: #404040 ; }
 sup { font-size: 75% ; }
 </style>
 </head>
@@ -28,6 +29,7 @@ sup { font-size: 75% ; }
     <b> {{veh.name}} </b>
     {%if veh.image%} <br> <img src="{{veh.image}}"> {%endif%}
     <div class="note">
+        {%if veh.extn_id%} &#x2756; {%endif%}
         {%if veh.notes%}
             {{veh.note_number}}, {{veh.notes | join(", ")}}
         {%else%}
@@ -35,7 +37,8 @@ sup { font-size: 75% ; }
         {%endif%}
     </div>
 <td valign="top" style="padding:2px 5px;">
-    {%for cap in veh.capabilities%} <div> {{cap}} </div> {%endfor%}
+    {%for cap in veh.capabilities%} <div class="capability"> {{cap}} </div> {%endfor%}
+    {%for cmnt in veh.comments%} <div class="comment"> {{cmnt}} </div> {%endfor%}
 {%endfor%}
 
 </table>
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
index d993fb6..bb889c7 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
@@ -4,6 +4,8 @@
 <meta charset="utf-8">
 <style>
 .ma-note .key { font-weight: bold ; }
+.ma-note table { margin-left: 10px ; }
+.ma-note td { padding: 0 ; }
 .extra-notes-caption { border: 1px solid #e0e0e0 ; background: #fcfcfc ; font-weight: bold ; padding: 2px 5px ; }
 ul { margin: 0 0 0 15px ; padding: 0 ; }
 sup { font-size: 75% ; }
diff --git a/vasl_templates/webapp/data/expected-multiple-images.json b/vasl_templates/webapp/data/expected-multiple-images.json
index 9165c69..fcc9ef1 100644
--- a/vasl_templates/webapp/data/expected-multiple-images.json
+++ b/vasl_templates/webapp/data/expected-multiple-images.json
@@ -10,6 +10,22 @@
     "name": "76* INF FRC",
     "front_images": [ "al/gun/alINF76", "al/gun/alINF76u" ],
     "back_images": "al/gun/alINF76b"
+},
+
+"adf:1828": {
+    "name": "105 ART wz.29",
+    "front_images": "po/gun/poARTwz29-BFP.png",
+    "back_images": [ "po/gun/poARTwz29-BFP.png", "po/gun/poARTwz29-BFPb.png" ]
+},
+"adf:1829": {
+    "name": "120* ART wz09.31",
+    "front_images": "po/gun/poARTwz0931-BFP.png",
+    "back_images": [ "po/gun/poARTwz0931-BFP.png", "po/gun/poARTwz0931-BFPb.png" ]
+},
+"adf:1830": {
+    "name": "155 ART wz.17",
+    "front_images": "po/gun/poARTwz17-BFP.png",
+    "back_images": [ "po/gun/poARTwz17-BFP.png", "po/gun/poARTwz17-BFPb.png" ]
 }
 
 }
diff --git a/vasl_templates/webapp/data/extensions/bfp-cobra.json b/vasl_templates/webapp/data/extensions/bfp-cobra.json
new file mode 100644
index 0000000..6279fe9
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-cobra.json
@@ -0,0 +1,181 @@
+{
+
+"parentExtensionId": "adf",
+"extensionId": "cobra",
+"version": "4.03",
+"id_range": [ 850, 899 ],
+"comment": "These are F (flamethrower) and C (Culin) versions of the same vehicles (from Operation Cobra).",
+
+"american": {
+
+"vehicles": [
+
+{ "name": "M5A1C",
+  "type": "LT",
+  "CS#": 4,
+  "capabilities": [ "C7\u2020<sup>2</sup>" ],
+  "note_number": "5\u2020",
+  "notes": [ "US C\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US N", "US Y", "A", "B" ],
+  "id": "am/v:850",
+  "gpid": "adf:154"
+},
+{ "name": "M4C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "8\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:851",
+  "gpid": "adf:160"
+},
+{ "name": "M4A1C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "9\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US N", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:852",
+  "gpid": "adf:164"
+},
+{ "name": "M4A3C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [4,"4+"] ] },
+  "note_number": "12\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:853",
+  "gpid": "adf:172"
+},
+{ "name": "M4A3C(75)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "13\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:854",
+  "gpid": "adf:176"
+},
+{ "name": "M4A1C(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "15\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "A", "B" ],
+  "id": "am/v:855",
+  "gpid": "adf:180"
+},
+{ "name": "M4A3C(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "16\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "A", "B" ],
+  "id": "am/v:856",
+  "gpid": "adf:184"
+},
+{ "name": "M4C(105)",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
+  "note_number": "17\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:857",
+  "gpid": "adf:188"
+},
+{ "name": "M4A3C(105)",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
+  "note_number": "17\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:858",
+  "gpid": "adf:190"
+},
+{ "name": "M10C GMC",
+  "type": "TD",
+  "CS#": 7,
+  "capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
+  "note_number": "23\u2020",
+  "notes": [ "US A\u2020<sup>1</sup>", "US N", "US Y", "A", "B" ],
+  "id": "am/v:859",
+  "gpid": "adf:192"
+},
+{ "name": "M8C HMC",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "H": 9, "C": [ [4,"4+"], "\u2020<sup>1</sup>" ], "WP": 9 },
+  "note_number": "43\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:860",
+  "gpid": "adf:194"
+},
+
+{ "name": "M5A1F",
+  "type": "LT",
+  "CS#": 4,
+  "capabilities": [ "C7\u2020<sup>2</sup>" ],
+  "note_number": "5\u2020",
+  "notes": [ "US C\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US N", "US Y", "C" ],
+  "id": "am/v:870",
+  "gpid": "adf:156"
+},
+{ "name": "M4F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "8\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:871",
+  "gpid": "adf:162"
+},
+{ "name": "M4A1F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "9\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US N", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:872",
+  "gpid": "adf:166"
+},
+{ "name": "M4A3F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [4,"4+"] ] },
+  "note_number": "12\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:873",
+  "gpid": "adf:174"
+},
+{ "name": "M4A3F(75)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "13\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "C" ],
+  "id": "am/v:874",
+  "gpid": "adf:178"
+},
+{ "name": "M4A1F(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "15\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "C" ],
+  "id": "am/v:875",
+  "gpid": "adf:182"
+},
+{ "name": "M4A3F(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "16\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "Y", "C" ],
+  "id": "am/v:876",
+  "gpid": "adf:186"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/bfp-pif.json b/vasl_templates/webapp/data/extensions/bfp-pif.json
new file mode 100644
index 0000000..0916d99
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-pif.json
@@ -0,0 +1,543 @@
+{
+
+"parentExtensionId": "adf",
+"extensionId": "pif",
+"version": "4.03",
+"id_range": [ 800, 849 ],
+
+"polish": {
+
+"vehicles": [
+
+{ "name": "TKS-AA",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020<sup>2</sup>",
+  "notes": [ "A\u2020<sup>1</sup>", "C\u2020", "AllM D" ],
+  "id": "po/v:800",
+  "gpid": "adf:919"
+},
+{ "name": "FT-18C (f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 9, "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "Road Rate NA" ],
+  "note_number": "2\u2020",
+  "notes": [ "B", "D\u2020<sup>1</sup>", "Fr C" ],
+  "id": "po/v:801",
+  "gpid": "adf:907"
+},
+{ "name": "FT-17K (f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 9, "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "Road Rate NA", "+4 ESB" ],
+  "note_number": "3\u2020",
+  "notes": [ "B", "D\u2020<sup>1</sup>", "Fr C" ],
+  "id": "po/v:802",
+  "gpid": "adf:1732"
+},
+{ "name": "TKS-D",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "comments": [ "12: Immob, 11: Stall" ],
+  "note_number": "4",
+  "notes": [ "C\u2020", "AllM D" ],
+  "id": "po/v:803",
+  "gpid": "adf:927"
+},
+{ "name": "TKD",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "12: Immob, 11: Stall" ],
+  "note_number": "5\u2020<sup>1</sup>",
+  "notes": [ "C\u2020", "D\u2020<sup>1</sup>", "AllM D" ],
+  "id": "po/v:804",
+  "gpid": "adf:1614"
+},
+{ "name": "H39(f)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 10 },
+  "note_number": "6",
+  "notes": [ "B", "Fr A\u2020", "Fr C" ],
+  "id": "po/v:805",
+  "gpid": "adf:915"
+},
+{ "name": "7TPjw(L)",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "7",
+  "id": "po/v:806",
+  "gpid": "adf:891"
+},
+{ "name": "wz. 34 Half Track",
+  "type": "ht",
+  "cs#": 6,
+  "note_number": "8",
+  "id": "po/v:807",
+  "gpid": "adf:1065"
+},
+{ "name": "wz. 34 C4P",
+  "type": "ht",
+  "cs#": 5,
+  "note_number": "9",
+  "id": "po/v:808",
+  "gpid": "adf:1061"
+},
+{ "name": "PF621L",
+  "type": "tr",
+  "cs#": 6,
+  "note_number": "10",
+  "id": "po/v:809",
+  "gpid": "adf:1053"
+},
+{ "name": "PF621L AAtr",
+  "type": "AAtr",
+  "CS#": 6,
+  "comments": [ "MA: AA" ],
+  "note_number": "11\u2020",
+  "id": "po/v:810",
+  "gpid": "adf:1601"
+},
+{ "name": "Praga RV",
+  "type": "tr",
+  "CS#": 7,
+  "note_number": "12",
+  "id": "po/v:811",
+  "gpid": "adf:1057"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "FK-A wz.38 Autocannon",
+  "type": "AT",
+  "capabilities": [ "T", "QSU" ],
+  "comments": [ "No Gunshield.", "Tow NA\u2020" ],
+  "note_number": "1",
+  "notes": [ "A", "AllM T\u2020" ],
+  "id": "po/o:800",
+  "gpid": "adf:833"
+},
+{ "name": "65mm wz.06",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "C6\u2020", "h-d" ],
+  "comments": [ "No Gunshield." ],
+  "note_number": "2",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:801",
+  "gpid": "adf:861"
+},
+{ "name": "75mm wz.02/26",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 6, "C": "6\u2020" },
+  "note_number": "3",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:802",
+  "gpid": "adf:855"
+},
+{ "name": "75mm wz.97",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "s": 8, "C": "6\u2020" },
+  "note_number": "4",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:803",
+  "gpid": "adf:854"
+},
+{ "name": "75mm wz.28",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 6, "AP": 5, "C": "6\u2020" },
+  "note_number": "5",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:804",
+  "gpid": "adf:854"
+},
+{ "name": "76mm wz.02",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 8, "C": "6\u2020" },
+  "note_number": "6",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:805",
+  "gpid": "adf:856"
+},
+{ "name": "100mm wz.14/19",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "C": "6\u2020" },
+  "note_number": "7",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:806",
+  "gpid": "adf:857"
+},
+{ "name": "100mm wz.29",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "C": "4\u2020" },
+  "note_number": "8",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:807",
+  "gpid": "adf:1828"
+},
+{ "name": "120mm wz.09/31",
+  "type": "ART",
+  "capabilities": [ "NT", "h-d" ],
+  "capabilities2": { "s": 6, "C": "5\u2020" },
+  "note_number": "9",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:808",
+  "gpid": "adf:1829"
+},
+{ "name": "155mm wz.17",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "10",
+  "id": "po/o:809",
+  "gpid": "adf:1830"
+}
+
+]
+
+},
+
+"german": {
+
+"vehicles": [
+
+{ "name": "PzKpfw IA",
+  "type": "Tt",
+  "CS#": 2,
+  "capabilities2": { "sD": 6 },
+  "comments": [ "2 TK DR (MG)" ],
+  "note_number": "1\u2020",
+  "notes": [ "Ge N" ],
+  "id": "ge/v:800",
+  "gpid": "adf:1464"
+},
+{ "name": "PzKpfw ICV",
+  "type": "Tt",
+  "CS#": 3,
+  "capabilities2": { "sD": 5 },
+  "note_number": "2",
+  "notes": [ "A\u2020" ],
+  "id": "ge/v:801",
+  "gpid": "adf:1460"
+},
+{ "name": "PzKpfw IID",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "sD": 6 },
+  "note_number": "3",
+  "id": "ge/v:802",
+  "gpid": "adf:1468"
+},
+{ "name": "PzKpfw II Bridgelayer",
+  "type": "LTv",
+  "CS#": 2,
+  "capabilities2": { "sD": 6 },
+  "note_number": "4\u2020",
+  "id": "ge/v:803",
+  "gpid": "adf:1833"
+},
+{ "name": "Pz-7TP",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "B\u2020" ],
+  "id": "ge/v:804",
+  "gpid": "adf:1456"
+},
+{ "name": "PSW M35",
+  "type": "AC",
+  "CS#": 5,
+  "comments": [ "REV x2" ],
+  "note_number": "6\u2020",
+  "id": "ge/v:805",
+  "gpid": "adf:1448"
+},
+{ "name": "SdKfz8 FlaK 18",
+  "type": "TDht",
+  "CS#": 6,
+  "capabilities2": { "A": [ [5,2], [4,3] ] },
+  "comments": [ "CE +3 VCA", "MA: Rear VCA NA" ],
+  "note_number": "7\u2020\u2020<sup>1</sup>",
+  "id": "ge/v:806",
+  "gpid": "adf:1472"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "2cm Tankb&uuml;sche S-18",
+  "type": "ATR",
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "No Long Range" ],
+  "note_number": "1\u2020",
+  "notes": [ "AxM A" ],
+  "id": "ge/o:800",
+  "gpid": "adf:1407"
+},
+{ "name": "4.7 cm PaK 36(t)",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": [ [5,1], [4,2] ] },
+  "note_number": "2\u2020",
+  "id": "ge/o:801",
+  "gpid": "adf:1480"
+},
+{ "name": "7.5 cm Geb G36",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": "7\u2020" },
+  "note_number": "3\u2020",
+  "notes": [ "Ge O" ],
+  "id": "ge/o:802",
+  "gpid": "adf:1481"
+},
+{ "name": "10.5 cm Geb H40",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 8 },
+  "note_number": "4\u2020",
+  "notes": [ "Ge O" ],
+  "id": "ge/o:803",
+  "gpid": "adf:1482"
+}
+
+]
+
+},
+
+"russian": {
+
+"vehicles": [
+
+{ "name": "BT-2A",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "CMG 2:00 from MA" ],
+  "note_number": "1\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:800",
+  "gpid": "adf:1691"
+},
+{ "name": "BT-2A(L)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "6\u2020<sup>2</sup>" },
+  "note_number": "2\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:801",
+  "gpid": "adf:1720"
+},
+{ "name": "BT-2B",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "comments": [ "2 TK DR (MG)" ],
+  "note_number": "3\u2020",
+  "notes": [ "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:802",
+  "gpid": "adf:1722"
+},
+{ "name": "OT-26",
+  "type": "LTv",
+  "no_radio": "\u00ae",
+  "CS#": "2:brewup",
+  "note_number": "4\u2020<sup>1</sup>",
+  "notes": [ "Ru M\u2020" ],
+  "id": "ru/v:903",
+  "gpid": "adf:1728"
+},
+{ "name": "T-26 M31",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "5\u2020",
+  "notes": [ "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:804",
+  "gpid": "adf:1701"
+},
+{ "name": "T-26 M32",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "6\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:805",
+  "gpid": "adf:1703"
+},
+{ "name": "T-26 M32U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "7\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:806",
+  "gpid": "adf:1709"
+},
+{ "name": "T-26 M32(L)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "8\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:807",
+  "gpid": "adf:1707"
+},
+{ "name": "T-26 M32U(L)",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd MG: Port" ],
+  "note_number": "9\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:808",
+  "gpid": "adf:1711"
+},
+{ "name": "T-26 M33",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": 5 },
+  "comments": [ "C4 applies if equipped with optional CMG." ],
+  "note_number": "10\u2020<sup>3</sup>",
+  "notes": [ "Ru D\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:809",
+  "gpid": "adf:1713"
+},
+{ "name": "T-26 M33U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>1</sup>" },
+  "note_number": "11",
+  "notes": [ "C\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ru/v:810",
+  "gpid": "adf:1716"
+},
+{ "name": "T-26 M39U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>1</sup>" },
+  "note_number": "12",
+  "notes": [ "C\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ru/v:811",
+  "gpid": "adf:1718"
+},
+{ "name": "BT-5 M34",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "note_number": "13",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:812",
+  "gpid": "adf:1693"
+},
+{ "name": "BT-7 M37",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>3</sup>" },
+  "note_number": "14",
+  "notes": [ "C\u2020<sup>3</sup>", "Ru D\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:813",
+  "gpid": "adf:1685"
+},
+{ "name": "T-26A",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>3</sup>", "s": 9 },
+  "note_number": "15\u2020",
+  "notes": [ "B", "C\u2020<sup>3</sup>", "Ru D\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:814",
+  "gpid": "adf:1695"
+},
+{ "name": "BT-7A",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>2</sup>", "s": 9 },
+  "note_number": "16\u2020",
+  "notes": [ "B", "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:815",
+  "gpid": "adf:1689"
+},
+{ "name": "BA-6",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities2": { "A": [ [4,2], [5,3] ], "C": "4\u2020" },
+  "note_number": "17\u2020",
+  "id": "ru/v:816",
+  "gpid": "adf:1726"
+},
+{ "name": "SU-12",
+  "type": "SPAtr",
+  "CS#": 4,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>2</sup>", "s": 8 },
+  "note_number": "18\u2020",
+  "notes": [ "B", "C\u2020<sup>2</sup>", "Ru F\u2020<sup>1</sup>" ],
+  "id": "ru/v:817",
+  "gpid": "adf:1724"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "37mm PTP obr. 30",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "C": "5\u2020" },
+  "note_number": "1",
+  "notes": [ "B\u2020" ],
+  "id": "ru/o:800",
+  "gpid": "adf:1824"
+},
+{ "name": "37mm PP obr. 15R",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "C": "5\u2020" },
+  "note_number": "2",
+  "notes": [ "B\u2020" ],
+  "id": "ru/o:801",
+  "gpid": "adf:1822"
+},
+{ "name": "76.2mm PP obr. 27",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 6, "s": 8, "C": "6\u2020" },
+  "note_number": "3",
+  "notes": [ "A", "B\u2020", "Ru A" ],
+  "id": "ru/o:802",
+  "gpid": "adf:1823"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/bfp-v403.json b/vasl_templates/webapp/data/extensions/bfp-v403.json
new file mode 100644
index 0000000..f6953cc
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-v403.json
@@ -0,0 +1,938 @@
+{
+
+"extensionId": "adf",
+"version": "4.03",
+"id_range": [ 900, 999 ],
+
+"japanese": {
+
+"vehicles": [
+
+{ "name": "FT-17M Ko(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020",
+  "notes": [ "A", "Fr C", "Ru M\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:900",
+  "gpid": "adf:278"
+},
+{ "name": "FT-17C Ko(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "2\u2020",
+  "notes": [ "A", "B", "Fr C", "Ru M\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:901",
+  "gpid": "adf:280"
+},
+{ "name": "NC-27M Otsu(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "3\u2020",
+  "notes": [ "A", "Fr C", "Ge H\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:902",
+  "gpid": "adf:282"
+},
+{ "name": "NC-27C Otsu(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "4\u2020",
+  "notes": [ "A", "B", "Fr C", "Ge H\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:903",
+  "gpid": "adf:284"
+},
+{ "name": "Type 88 LAV(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "5",
+  "notes": [ "A", "AllM D", "Ch H\u2020" ] ,
+  "id": "ja/v:904",
+  "gpid": "adf:286"
+},
+{ "name": "VCL(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "6\u2020",
+  "notes": [ "A", "C", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ja/v:905",
+  "gpid": "adf:288"
+},
+{ "name": "Type 98 Ke-Ni",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "7\u2020",
+  "notes": [ "Jp C" ],
+  "id": "ja/v:906",
+  "gpid": "adf:316"
+},
+{ "name": "Type 2 Ke-To",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "8\u2020",
+  "notes": [ "Jp C" ],
+  "id": "ja/v:907",
+  "gpid": "adf:318"
+},
+{ "name": "M3(a)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "9",
+  "notes": [ "A", "B", "C", "Jp A\u2020", "US B\u2020<sup>1</sup>" ],
+  "id": "ja/v:908",
+  "gpid": "adf:320"
+},
+{ "name": "Stuart I(a)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities2": { "sD": 4 },
+  "note_number": "10",
+  "notes": [ "A", "B", "C", "Jp A\u2020" ],
+  "id": "ja/v:909",
+  "gpid": "adf:322"
+},
+{ "name": "Type 97B Shi-Ki",
+  "type": "MT",
+  "CS#": 4,
+  "capabilities2": { "sD": 6 },
+  "note_number": "11\u2020",
+  "comments": [ "Moved/Motion: Fire NA" ],
+  "id": "ja/v:910",
+  "gpid": "adf:324"
+},
+{ "name": "Type 3 Ka-Chi",
+  "type": "MT",
+  "CS#": 5,
+  "capabilities2": { "sD": 5 },
+  "note_number": "12",
+  "notes": [ "Jp 6\u2020" ],
+  "comments": [ "Refer to Japanese Note 6 on Pontoons for amphibious data and wreck." ],
+  "id": "ja/v:911",
+  "gpid": "adf:326"
+},
+{ "name": "Type 3 Ka-Chi (without pontoons)",
+  "type": "MT",
+  "CS#": 5,
+  "capabilities2": { "sD": 5 },
+  "note_number": "12",
+  "notes": [ "Jp 6\u2020" ],
+  "id": "ja/v:912",
+  "gpid": "adf:328"
+},
+{ "name": "Armored Eng Veh SS",
+  "type": "MTv",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "capabilities2": { "sD": 7 },
+  "note_number": "13\u2020",
+  "comments": [ "Has 2 side FT with limited traverse.", "May remove wire as if a Dozer (B24.7)." ],
+  "id": "ja/v:913",
+  "gpid": "adf:331"
+},
+{ "name": "Type 2587(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "14\u2020",
+  "notes": [ "Ch F\u2020" ],
+  "comments": [ "REV x4" ],
+  "id": "ja/v:914",
+  "gpid": "adf:333"
+},
+{ "name": "Marmon-Herrington III(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "15\u2020",
+  "notes": [ "C", "Ch F\u2020" ],
+  "id": "ja/v:915",
+  "gpid": "adf:335"
+},
+{ "name": "Type 1 Ho-Ha",
+  "type": "ht",
+  "CS#": 5,
+  "note_number": "16\u2020",
+  "comments": [ "2MA&amp;2&amp;2" ],
+  "id": "ja/v:916",
+  "gpid": "adf:337"
+},
+{ "name": "M3A1 Scout Car(a)",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "17",
+  "notes": [ "A", "C", "AllM 34\u2020<sup>2</sup>", "Jp A\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ],
+  "id": "ja/v:917",
+  "gpid": "adf:339"
+},
+{ "name": "Carrier A(b)",
+  "type": "APC",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "18",
+  "notes": [ "A", "C", "Br Note 64\u2020" ],
+  "comments": [ "The Inherent Crew is a 2-3-7 HS (D6.82).", "Refer to British Vehicle Note 64 for switching the BMG to an AAMG." ],
+  "id": "ja/v:918",
+  "gpid": "adf:341"
+},
+{ "name": "Type 2 Ho-I",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "WP": 5, "sD": 5 },
+  "note_number": "19",
+  "id": "ja/v:919",
+  "gpid": "adf:343"
+},
+{ "name": "Type 1 Ho-Ni II",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "H": 5 },
+  "note_number": "20\u2020",
+  "id": "ja/v:920",
+  "gpid": "adf:345"
+},
+{ "name": "M3 75 SPA(a)",
+  "type": "SPAht",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "21",
+  "notes": [ "B", "C", "US U", "Ru M\u2020" ],
+  "id": "ja/v:921",
+  "gpid": "adf:347"
+},
+{ "name": "Type 97B Chi-Ha",
+  "type": "SPA",
+  "CS#": 4,
+  "capabilities2": { "H": 9 },
+  "note_number": "22",
+  "id": "ja/v:922",
+  "gpid": "adf:349"
+},
+{ "name": "Type 3 Ho-Ni III",
+  "type": "TD",
+  "CS#": 5,
+  "capabilities2": { "WP": 5 },
+  "note_number": "23",
+  "id": "ja/v:923",
+  "gpid": "adf:351"
+},
+{ "name": "Type 97 AA Truck",
+  "type": "AAtr",
+  "CS#": 7,
+  "note_number": "24\u2020",
+  "comments": [ "MA: AA" ],
+  "id": "ja/v:924",
+  "gpid": "adf:353"
+},
+{ "name": "Type 98 MCT",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "25",
+  "notes": [ "Br H", "Ge A\u2020" ],
+  "comments": [ "Bnd FF NA VCA", "MA: AA", "(Un)load: Portee" ],
+  "id": "ja/v:925",
+  "gpid": "adf:355"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Type 45 (1912) 24cm Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT", "NM", "No IF", "HE TK# 23", "Tow NA" ],
+  "note_number": "1\u2020",
+  "notes": [ "Jp D\u2020<sup>1</sup>" ],
+  "id": "ja/o:900",
+  "gpid": "adf:274"
+},
+{ "name": "Type 91 Vickers AA Gun",
+  "type": "AA",
+  "capabilities": [ "AP TK# 8" ],
+  "capabilities2": { "LF": [ "40(4)", "1 ROF", "B10"] },
+  "note_number": "2\u2020",
+  "id": "ja/o:901",
+  "gpid": "adf:275"
+},
+{ "name": "Type 91 Twin-mount Vickers AA Gun",
+  "type": "AA",
+  "capabilities": [ "AP TK# 8", "2 TK DR's\u2020" ],
+  "capabilities2": { "LF": [ "40(8)", "1 ROF", "B10" ] },
+  "note_number": "3\u2020",
+  "id": "ja/o:902",
+  "gpid": "adf:276"
+},
+{ "name": "Type 4 75mm AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP": [ [6,"44-"] ] },
+  "note_number": "4\u2020",
+  "notes": [ "Ch G"],
+  "id": "ja/o:903",
+  "gpid": "adf:277"
+}
+
+]
+
+},
+
+"chinese": {
+
+"vehicles": [
+
+{ "name": "FT-17(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020",
+  "notes": [ "A", "Fr C", "Ru M\u2020" ],
+  "id": "ch/v:900",
+  "gpid": "adf:233"
+},
+{ "name": "Type 94 Lt Armored Vehicle(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "2",
+  "notes": [ "A", "D", "Ru M\u2020" ],
+  "id": "ch/v:901",
+  "gpid": "adf:235"
+},
+{ "name": "Type 97A Te-Ke(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "3",
+  "notes": [ "A", "D" ],
+  "id": "ch/v:902",
+  "gpid": "adf:237"
+},
+{ "name": "Type 97B Te-Ke(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "4",
+  "notes": [ "A", "C", "D" ],
+  "id": "ch/v:903",
+  "gpid": "adf:239"
+},
+{ "name": "Type 95 Ha-Go(j)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "A", "B\u2020", "C", "D", "Jp 5\u2020<sup>1</sup>" ],
+  "id": "ch/v:904",
+  "gpid": "adf:241"
+},
+{ "name": "BT-5(r)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "6",
+  "notes": [ "A", "B\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ch/v:905",
+  "gpid": "adf:243"
+},
+{ "name": "Type 89A Chi-Ro(j)",
+  "type": "MT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "7",
+  "notes": [ "A", "B\u2020", "C", "D" ],
+  "id": "ch/v:906",
+  "gpid": "adf:245"
+},
+{ "name": "Type 97A Chi-Ha(j)",
+  "type": "MT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "8",
+  "notes": [ "A", "B\u2020", "C", "D" ],
+  "id": "ch/v:907",
+  "gpid": "adf:247"
+},
+{ "name": "Type 31 Armored Car",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "9\u2020",
+  "notes": [ "B\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "id": "ch/v:908",
+  "gpid": "adf:249"
+}
+
+]
+
+},
+
+"dutch": {
+
+"vehicles": [
+
+{ "name": "Alvis-Straussler AC3D",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "1\u2020<sup>2</sup>",
+  "notes": [ "AllM V\u2020", "Ch F\u2020<sup>1</sup>" ],
+  "comments": [ "CMG uses AP TK 12.7 column." ],
+  "id": "du/v:900",
+  "gpid": "adf:10"
+},
+{ "name": "Braat Overvalwagen APC",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "note_number": "2\u2020<sup>2</sup>",
+  "notes": [ "A\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ],
+  "id": "du/v:901",
+  "gpid": "adf:12"
+},
+{ "name": "Braat Overvalwagen AA",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "3\u2020<sup>1</sup>",
+  "notes": [ "AllM AA\u2020<sup>2</sup>", "Ch F\u2020" ],
+  "comments": [ "AAMG uses AP TK 12.7 column." ],
+  "id": "du/v:902",
+  "gpid": "adf:14"
+},
+{ "name": "Kanonwagen Armored Car",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "4\u2020\u2020<sup>1</sup>",
+  "notes": [ "A\u2020<sup>2</sup>", "AllM V\u2020", "Ch F\u2020<sup>1</sup>" ],
+  "comments": [ "VCA MA: VCA &le; level NA", "CMG may only fire within VCA.", "Rear turret is unarmored when TCA = VCA." ],
+  "id": "du/v:903",
+  "gpid": "adf:16"
+},
+{ "name": "Stadswacht Overvalwagen APC",
+  "type": "AC",
+  "CS#": 6,
+  "note_number": "5\u2020<sup>1</sup>",
+  "notes": [ "Ch F\u2020" ],
+  "comments": [ "Mounted Fire: Full FP", "Passengers may fire 2 LMG's without losing inherent FP." ],
+  "id": "du/v:904",
+  "gpid": "adf:18"
+},
+{ "name": "PLA Wagen",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "6\u2020",
+  "notes": [ "AllM AA\u2020<sup>1</sup>" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "du/v:905",
+  "gpid": "adf:20"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Brandt 47mm Mortar",
+  "type": "MTR",
+  "note_number": "1",
+  "id": "du/o:900",
+  "gpid": "adf:1948"
+},
+{ "name": "Krupp 75mm M1933 Field Gun",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "C": "4\u2020" },
+  "note_number": "2",
+  "notes": [ "US C\u2020" ],
+  "id": "du/o:901",
+  "gpid": "adf:5"
+},
+{ "name": "Bofors 105mm M1924 Howitzer",
+  "type": "ART",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "NT", "B11" ] },
+  "note_number": "3",
+  "id": "du/o:902",
+  "gpid": "adf:6"
+},
+{ "name": "20mm Rheinmetall AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B11", "NT" ] },
+  "note_number": "4",
+  "notes": [ "Gr C\u2020" ],
+  "id": "du/o:903",
+  "gpid": "adf:7"
+},
+{ "name": "Bofors 80mm M29/38",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "80\u2020", "1 ROF", "B11" ] },
+  "capabilities_other": [ "AP TK# 17" ],
+  "note_number": "6",
+  "notes": [ "AxM G\u2020" ],
+  "id": "du/o:904",
+  "gpid": "adf:9"
+}
+
+]
+
+},
+
+"thai": {
+
+"vehicles": [
+
+{ "name": "VCL Mk VI(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1",
+  "notes": [ "A", "Ch H", "AllM D" ],
+  "id": "th/v:900",
+  "gpid": "adf:92"
+},
+{ "name": "Vickers 6-Ton MkE-B(b)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "2",
+  "notes": [ "A" ],
+  "id": "th/v:901",
+  "gpid": "adf:94"
+},
+{ "name": "Type 83(j)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "3",
+  "notes": [ "A", "E\u2020" ],
+  "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ],
+  "id": "th/v:902",
+  "gpid": "adf:96"
+},
+{ "name": "Vickers 6-Ton AA(b)",
+  "type": "SPAA",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities": [ "AP TK# 8" ],
+  "note_number": "4",
+  "notes": [ "A", "AllM AA\u2020" ],
+  "id": "th/v:903",
+  "gpid": "adf:98"
+},
+{ "name": "Citroen-Kegresse P17(f)",
+  "type": "ht",
+  "CS#": 3,
+  "note_number": "5\u2020",
+  "notes": [ "A" ],
+  "id": "th/v:904",
+  "gpid": "adf:100"
+},
+{ "name": "Vickers Morris M1930(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "6",
+  "notes": [ "Br X\u2020", "Ch F\u2020" ],
+  "comments": [ "REV x4" ],
+  "id": "th/v:905",
+  "gpid": "adf:102"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "50mm Krupp M1906",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
+  "note_number": "4",
+  "id": "th/o:900",
+  "gpid": "adf:81"
+},
+{ "name": "75mm Krupp M1908",
+  "type": "INF",
+  "capabilities": [ "NT",  "QSU", "h-d" ],
+  "capabilities2": { "AP": 8, "WP": 5 },
+  "note_number": "5",
+  "id": "th/o:901",
+  "gpid": "adf:82"
+},
+{ "name": "Vickers 12.7mm AA Class D",
+  "type": "AA",
+  "capabilities": [ "T",  "QSU" ],
+  "note_number": "8",
+  "id": "th/o:902",
+  "gpid": "adf:85"
+},
+{ "name": "Bofors M30 75mm AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP":6 },
+  "note_number": "9",
+  "notes": [ "Ch G\u2020"],
+  "id": "th/o:902",
+  "gpid": "adf:86"
+}
+
+]
+
+},
+
+"indonesian": {
+
+"vehicles": [
+
+{ "name": "Type 94 Light Armoured Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "1",
+  "notes": [ "C", "Ru M\u2020" ],
+  "id": "ina/v:900",
+  "gpid": "adf:123"
+},
+{ "name": "Type 97A Te-Ke Light Armored Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "2",
+  "notes": [ "C" ],
+  "id": "ina/v:901",
+  "gpid": "adf:125"
+},
+{ "name": "Type 97B Te-Ke Light Armored Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "3",
+  "notes": [ "C" ],
+  "id": "ina/v:902",
+  "gpid": "adf:127"
+},
+{ "name": "Universal Carrier (b)",
+  "type": "Tt",
+  "CS#": 3,
+  "note_number": "4",
+  "notes": [ "C" ],
+  "id": "ina/v:903",
+  "gpid": "adf:129"
+},
+{ "name": "Type 95 Ha-Go(j)",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "B", "C", "D\u2020", "E\u2020<sup>1</sup>" ],
+  "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ],
+  "id": "ina/v:904",
+  "gpid": "adf:131"
+},
+{ "name": "VCL M1936 (b)",
+  "type": "aTt",
+  "CS#": 2,
+  "note_number": "6",
+  "notes": [ "C" ],
+  "id": "ina/v:905",
+  "gpid": "adf:133"
+},
+{ "name": "CTLS-4 (a)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "7",
+  "notes": [ "C", "Ru M\u2020", "AllM 26\u2020<sup>1</sup>" ],
+  "comments": [ "Port VCA NA (see Allied Minor Vehicle Note 26)." ],
+  "id": "ina/v:906",
+  "gpid": "adf:135"
+},
+{ "name": "Marmon-Herrington III Armored Car (b)",
+  "type": "AC",
+  "CS#": 4,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "8",
+  "notes": [ "Ch F\u2020" ],
+  "id": "ina/v:907",
+  "gpid": "adf:137"
+},
+{ "name": "M3A1 Scout Car (a)",
+  "type": "SC",
+  "CS#": 4,
+  "note_number": "8",
+  "capabilities_other": [ "9PP" ],
+  "note_number": "9\u2020",
+  "notes": [ "D\u2020<sup>1</sup>", "AllM 34\u2020<sup>2</sup>" ],
+  "comments": [ "AP TK: use 12.7 column.", "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ],
+  "id": "ina/v:908",
+  "gpid": "adf:139"
+},
+{ "name": "Braat Overvalwagen AA",
+  "type": "AC",
+  "CS#": 4,
+  "note_number": "8",
+  "note_number": "10\u2020<sup>1</sup>",
+  "notes": [ "Ch F\u2020", "AllM AA\u2020<sup>1</sup>" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:909",
+  "gpid": "adf:14"
+},
+{ "name": "Braat Overvalwagen APC",
+  "type": "AC",
+  "CS#": 5,
+  "note_number": "8",
+  "capabilities_other": [ "12PP" ],
+  "note_number": "11\u2020<sup>2</sup>",
+  "notes": [ "D\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ],
+  "id": "ina/v:910",
+  "gpid": "adf:12"
+},
+{ "name": "Alvis-Straussler AC3D",
+  "type": "AC",
+  "CS#": 4,
+  "note_number": "8",
+  "note_number": "12\u2020<sup>1</sup>",
+  "notes": [ "D\u2020<sup>2</sup>", "Ru M\u2020" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:911",
+  "gpid": "adf:10"
+},
+{ "name": "PLA Wagen",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "13\u2020<sup>1</sup>",
+  "notes": [ "AllM AA\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:912",
+  "gpid": "adf:147"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Type 89 Heavy Grenade Launcher",
+  "type": "MTR",
+  "capabilities2": { "WP": [ [5,5] ], "S": [ [6,5] ] },
+  "capabilities_other": [ "4PP" ],
+  "note_number": "1",
+  "id": "ina/o:900",
+  "gpid": "adf:75"
+},
+{ "name": "Type 97 Automatic Gun",
+  "type": "ATR",
+  "capabilities": [ "Long Range is NA" ],
+  "capabilities_other": [ "5PP" ],
+  "note_number": "2",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:901",
+  "gpid": "adf:77"
+},
+{ "name": "Year-11 Flat-Trajectory INF Gun",
+  "type": "INF",
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "note_number": "3",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:902",
+  "gpid": "adf:76"
+},
+{ "name": "Type 94 Rapid-Fire Gun",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "note_number": "4",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:903",
+  "gpid": "adf:87"
+},
+{ "name": "Type 1 Machine-Moved Gun",
+  "type": "AT",
+  "capabilities_other": [ "NT", "QSU" ],
+  "note_number": "5",
+  "id": "ina/o:904",
+  "gpid": "adf:88"
+},
+{ "name": "Year-38 Type Field Gun (Improved)",
+  "type": "ART",
+  "capabilities2": { "WP": [ [5,5] ] },
+  "capabilities_other": [ "NT", "QSU", "h-d", "AP TK#12" ],
+  "note_number": "6",
+  "id": "ina/o:905",
+  "gpid": "adf:89"
+}
+
+]
+
+},
+
+"anzac": {
+
+"vehicles": [
+
+{ "name": "Matilda Frog",
+  "type": "HTv",
+  "CS#": 5,
+  "capabilities2": { "sD": "6" },
+  "note_number": "1\u2020",
+  "id": "anz/v:900",
+  "gpid": "adf:211"
+},
+{ "name": "Matilda II(L)",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "sD": "6" },
+  "note_number": "2\u2020",
+  "notes": [ "Br B\u2020<sup>1</sup>" ],
+  "id": "anz/v:901",
+  "gpid": [ "adf:213", "adf:215" ]
+},
+{ "name": "Matilda II CS(L)",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "s": "9", "sD": "6" },
+  "note_number": "3\u2020",
+  "notes": [ "Br S\u2020<sup>1</sup>" ],
+  "id": "anz/v:902",
+  "gpid": [ "adf:217", "adf:219" ]
+},
+{ "name": "Valentine III CS",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "s": "9", "sM": "8" },
+  "note_number": "4\u2020",
+  "notes": [ "Br S\u2020<sup>1</sup>" ],
+  "id": "anz/v:903",
+  "gpid": "adf:221"
+}
+
+]
+
+},
+
+"american": {
+
+"vehicles": [
+
+{ "name": "LVT(A)1(L)",
+  "type": "aLT",
+  "CS#": 6,
+  "capabilities2": { "C": [ [10,"P"], "\u2020<sup>2</sup>" ] },
+  "note_number": "1",
+  "notes": [ "US 46\u2020<sup>3</sup>", "C\u2020<sup>2</sup>", "G", "H", "P", "T\u2020", "X" ],
+  "comments": [ "Refer to U.S. Vehicle Note 46 and diagram for the AAMG." ],
+  "id": "am/v:900",
+  "gpid": "adf:196"
+},
+{ "name": "LVT(A)2F",
+  "type": "aAPCv",
+  "CS#": 7,
+  "note_number": "2",
+  "notes": [ "US H", "P", "Q\u2020<sup>1</sup>", "T\u2020<sup>1</sup>"],
+  "id": "am/v:901",
+  "gpid": "adf:198"
+},
+{ "name": "LVT4F",
+  "type": "aAPCv",
+  "cs#": 7,
+  "note_number": "3\u2020<sup>2</sup>",
+  "notes": [ "US 51\u2020", "D\u2020<sup>3</sup>", "H", "P", "T\u2020<sup>1</sup>"],
+  "id": "am/v:902",
+  "gpid": "adf:200"
+},
+{ "name": "LVT(A)2FS",
+  "type": "aAPCv",
+  "CS#": 7,
+  "note_number": "4\u2020<sup>1</sup>",
+  "notes": [ "US D\u2020<sup>2</sup>", "H", "P", "T\u2020"],
+  "id": "am/v:903",
+  "gpid": "adf:202"
+},
+{ "name": "LVT4(L)",
+  "type": "aAPC",
+  "CS#": 7,
+  "note_number": "5",
+  "notes": [ "US 51\u2020", "D\u2020<sup>4</sup>", "H", "Q\u2020<sup>3</sup>", "T\u2020<sup>1</sup>", "X\u2020<sup>2</sup>"],
+  "id": "am/v:904",
+  "gpid": "adf:205"
+},
+{ "name": "LVT(A)4(L)",
+  "type": "aLT",
+  "CS#": 6,
+  "capabilities2": { "C": [ [7,"P"], "\u2020<sup>3</sup>" ], "H": 8, "WP": 9 },
+  "note_number": "6",
+  "notes": [ "US 46\u2020<sup>2</sup>", "C\u2020<sup>3</sup>", "G", "H", "P", "T\u2020", "X\u2020<sup>1</sup>"],
+  "id": "am/v:905",
+  "gpid": "adf:207"
+},
+{ "name": "M3A1F",
+  "type": "LTv",
+  "CS#": 4,
+  "capabilities2": { "C": [ [7,"P"], "\u2020" ] },
+  "note_number": "7",
+  "notes": [ "US C\u2020", "G", "P" ],
+  "id": "am/v:906",
+  "gpid": "adf:152"
+},
+{ "name": "M5A1 Satan",
+  "CS#": 4,
+  "note_number": "8\u2020",
+  "notes": [ "US P" ],
+  "id": "am/v:907",
+  "gpid": "adf:158"
+},
+{ "name": "M4A2F",
+  "type": "MTv",
+  "cs#": 5,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 5 },
+  "note_number": "9",
+  "notes": [ "US G", "P", "R" ],
+  "id": "am/v:908",
+  "gpid": "adf:168"
+},
+{ "name": "M4A2(L)F",
+  "type": "MTv",
+  "cs#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "10",
+  "notes": [ "US G", "P", "R" ],
+  "id": "am/v:909",
+  "gpid": "adf:170"
+},
+{ "name": "Carrier .50cal(b)",
+  "type": "APC",
+  "CS#": 3,
+  "note_number": "11\u2020",
+  "id": "am/v:910",
+  "gpid": "adf:209"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "20mm Oerlikon Mk4",
+  "type": "AA",
+  "capabilities": [ "T", "2 TK DR's\u2020" ],
+  "comments": [ "Multiple Hits (C3.8) are NA." ],
+  "note_number": "1\u2020",
+  "notes": [ "US P" ],
+  "id": "am/o:900",
+  "gpid": "adf:34"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/kgs-v1.1.json b/vasl_templates/webapp/data/extensions/kgs-v1.1.json
index bd795bf..0dfb87c 100644
--- a/vasl_templates/webapp/data/extensions/kgs-v1.1.json
+++ b/vasl_templates/webapp/data/extensions/kgs-v1.1.json
@@ -3,6 +3,8 @@
 "extensionId": "f97",
 "version": "v1.1",
 
+"russian": {
+
 "vehicles": [
 
 {
@@ -19,3 +21,5 @@
 ]
 
 }
+
+}
diff --git a/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json b/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
index 7a2931c..a4acfd0 100644
--- a/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
@@ -2,7 +2,8 @@
 
 { "name": "DBT",
   "type": "MTR",
-  "capabilities_other": [ "3PP", "\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "\u2020" ],
   "note_number": "6\u2020",
   "notes": [ "A", "B", "D" ],
   "id": "be/o:000",
@@ -29,7 +30,7 @@
 { "name": "7.6cm FRC",
   "type": "INF",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "\u2020" ],
+  "comments": [ "\u2020" ],
   "note_number": "8\u2020",
   "notes": [ "A", "B" ],
   "id": "be/o:003",
diff --git a/vasl_templates/webapp/data/ordnance/allied-minor/common.json b/vasl_templates/webapp/data/ordnance/allied-minor/common.json
index 57d05de..d75a07e 100644
--- a/vasl_templates/webapp/data/ordnance/allied-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/common.json
@@ -35,7 +35,8 @@
 },
 { "name": "65mm wz.06",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "27\u2020",
   "notes": [ "A", "Gr", "P", "Y" ],
   "id": "alc/o:004",
@@ -95,7 +96,8 @@
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
   "type": "AA",
-  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "34\u2020",
   "notes": [ "T\u2020<sup>1</sup>", "B", "Gr", "Y" ],
   "id": "alc/o:011",
diff --git a/vasl_templates/webapp/data/ordnance/american.json b/vasl_templates/webapp/data/ordnance/american.json
index 1625fb1..7a881fb 100644
--- a/vasl_templates/webapp/data/ordnance/american.json
+++ b/vasl_templates/webapp/data/ordnance/american.json
@@ -162,8 +162,9 @@
 },
 { "name": "M1918M1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>", "no IF" ],
+  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>" ],
   "capabilities2": { "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "19\u2020",
   "notes": [ "A\u2020<sup>1</sup>", "N" ],
   "id": "am/o:018",
@@ -171,8 +172,9 @@
 },
 { "name": "M1A1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>", "no IF" ],
+  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>" ],
   "capabilities2": { "s": [ [7,5] ], "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "20\u2020",
   "notes": [ "A\u2020<sup>1</sup>" ],
   "id": "am/o:019",
@@ -180,7 +182,8 @@
 },
 { "name": "M1 8-in. Howitzer",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "21\u2020",
   "id": "am/o:020",
   "gpid": 898
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
index 328c718..d0a54fe 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
@@ -10,8 +10,9 @@
 },
 { "name": "Madsen M-35",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities_other": [ "R2", "IFE=B10\u2020" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "38\u2020",
   "notes": [ "T\u2020<sup>1</sup>" ],
   "id": "bu/o:001",
@@ -58,7 +59,8 @@
 },
 { "name": "D/30 Krupp",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "43",
   "id": "bu/o:007",
   "gpid": 3781
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/common.json b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
index bb01bb4..4ae99ca 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
@@ -70,7 +70,8 @@
 },
 { "name": "Bohler M35",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "52\u2020",
   "notes": [ "A", "R", "H", "S" ],
   "id": "axc/o:008",
@@ -200,8 +201,9 @@
 },
 { "name": "Skoda M15/16",
   "type": "ART",
-  "capabilities": [ "NT", "no IF" ],
+  "capabilities": [ "NT" ],
   "capabilities2": { "s": 6 },
+  "comments": [ "No IF." ],
   "note_number": "67\u2020",
   "notes": [ "S", "C" ],
   "id": "axc/o:023",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
index 75b2baf..5219b73 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
@@ -2,7 +2,8 @@
 
 { "name": "Canonne da 65/17",
   "type": "INF",
-  "capabilities": [ "NT", "no Gunshield" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "35",
   "notes": [ "A" ],
   "id": "cr/o:000",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json b/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
index b4d60f4..5681662 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
@@ -27,7 +27,8 @@
 { "name": "Resita M43",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "Blk TH", "AP TK#18\u2020" ],
+  "capabilities_other": [ "AP TK#18\u2020" ],
+  "comments": [ "Blk TH" ],
   "note_number": "4\u2020",
   "id": "ro/o:003",
   "gpid": 3742
@@ -43,7 +44,8 @@
 },
 { "name": "Breda 47",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "6\u2020",
   "notes": [ "A" ],
   "id": "ro/o:005",
@@ -142,8 +144,9 @@
 },
 { "name": "Skoda M28 NOa",
   "type": "ART",
-  "capabilities": [ "NM", "no IF" ],
+  "capabilities": [ "NM" ],
   "capabilities_other": [ "ST" ],
+  "comments": [ "No IF." ],
   "note_number": "18",
   "id": "ro/o:017",
   "gpid": 3756
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
index 95f4fa0..63d34ae 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
@@ -37,7 +37,7 @@
 { "name": "Skoda 47L40(t)",
   "type": "AA",
   "capabilities": [ "T", "QSU" ],
-  "capabilities_other": [ "AA Fire ROF 2\u2020" ],
+  "comments": [ "AA Fire ROF 2\u2020" ],
   "note_number": "32\u2020",
   "notes": [ "E" ],
   "id": "sl/o:004",
diff --git a/vasl_templates/webapp/data/ordnance/british.json b/vasl_templates/webapp/data/ordnance/british.json
index f436dd4..a2c21ed 100644
--- a/vasl_templates/webapp/data/ordnance/british.json
+++ b/vasl_templates/webapp/data/ordnance/british.json
@@ -31,7 +31,7 @@
   "type": "MTR",
   "capabilities": [ "NT" ],
   "capabilities2": { "s": 8, "WP": 7 },
-  "capabilities_other": [ "Towed\u2020" ],
+  "comments": [ "Towed\u2020" ],
   "note_number": "3\u2020",
   "notes": [ "N", "P" ],
   "id": "br/o:003",
@@ -168,8 +168,8 @@
 },
 { "name": "OBL 7.2-in. Howitzer Mk I",
   "type": "ART",
-  "capabilities": [ "NT", "no IF" ],
-  "capabilities_other": [ "Acq. NA\u2020" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No IF.", "Acq. NA\u2020" ],
   "note_number": "18\u2020",
   "notes": [ "N", "P" ],
   "id": "br/o:019",
@@ -177,7 +177,8 @@
 },
 { "name": "OBL 7.2-in. Howitzer Mk VI",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "19\u2020",
   "notes": [ "P" ],
   "id": "br/o:020",
diff --git a/vasl_templates/webapp/data/ordnance/chinese.json b/vasl_templates/webapp/data/ordnance/chinese.json
index 047415a..607a449 100644
--- a/vasl_templates/webapp/data/ordnance/chinese.json
+++ b/vasl_templates/webapp/data/ordnance/chinese.json
@@ -2,7 +2,8 @@
 
 { "name": "Type 27 Grenade Launcher",
   "type": "MTR",
-  "capabilities_other": [ "2PP", "Air Bursts NA\u2020" ],
+  "capabilities_other": [ "2PP" ],
+  "comments": [ "Air Bursts NA\u2020" ],
   "note_number": "1\u2020",
   "notes": [ "A" ],
   "id": "ch/o:000",
@@ -115,7 +116,7 @@
 { "name": "37mm PP obr. 15R",
   "type": "ART",
   "capabilities": [ "NT", "QSU", "h-d" ],
-  "capabilities_other": [ "Low Ammo\u2020" ],
+  "comments": [ "Low Ammo\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "<s>B</s>" ],
   "id": "ch/o:013",
@@ -123,7 +124,8 @@
 },
 { "name": "Cannone da 70/15",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "Acq. NA\u2020", "Low Ammo\u2020", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "Acq. NA\u2020", "Low Ammo\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "A", "<s>B</s>" ],
   "id": "ch/o:014",
diff --git a/vasl_templates/webapp/data/ordnance/chinese~gmd.json b/vasl_templates/webapp/data/ordnance/chinese~gmd.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/vasl_templates/webapp/data/ordnance/chinese~gmd.json
@@ -0,0 +1 @@
+[]
diff --git a/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json b/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
index a47726e..27d40ad 100644
--- a/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
+++ b/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
@@ -81,7 +81,8 @@
 { "name": "57mm Type 36 Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 6, "WP": 5 },
-  "capabilities_other": [ "3PP", "crewed\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "26\u2020<sup>1</sup>",
   "notes": [ "R\u2020" ],
   "id": "cvpa/o:010",
@@ -90,7 +91,8 @@
 { "name": "75mm Type 52 Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 6, "WP": 5 },
-  "capabilities_other": [ "5PP", "crewed\u2020" ],
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "27",
   "notes": [ "R\u2020" ],
   "id": "cvpa/o:011",
@@ -133,7 +135,8 @@
 { "name": "Type 93 Twin-Mount High-Angle Machine Gun",
   "type": "AA",
   "capabilities": [ "T" ],
-  "capabilities_other": [ "2 TK DR\u2020", "Towing NA\u2020" ],
+  "capabilities_other": [ "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020" ],
   "note_number": "32\u2020",
   "notes": [ "A" ],
   "id": "cvpa/o:016",
diff --git a/vasl_templates/webapp/data/ordnance/finnish.json b/vasl_templates/webapp/data/ordnance/finnish.json
index ef66d2c..834b9f0 100644
--- a/vasl_templates/webapp/data/ordnance/finnish.json
+++ b/vasl_templates/webapp/data/ordnance/finnish.json
@@ -45,14 +45,16 @@
 },
 { "name": "Boys ATR(b)",
   "type": "ATR",
-  "capabilities_other": [ "1PP", "\"British\"\u2020" ],
+  "capabilities_other": [ "1PP" ],
+  "comments": [ "\"British\"\u2020" ],
   "note_number": "6\u2020",
   "id": "fi/o:005",
   "gpid": null
 },
 { "name": "Lahti ATR",
   "type": "ATR",
-  "capabilities_other": [ "4PP", "Light AA fire in 44+\u2020", "B30.35\u2020" ],
+  "capabilities_other": [ "4PP", "B30.35\u2020" ],
+  "comments": [ "Light AA fire in 44+\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "A" ],
   "id": "fi/o:006",
@@ -60,8 +62,9 @@
 },
 { "name": "20 PstK/40",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities_other": [ "R2", "IFE=B10" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "8\u2020",
   "notes": [ "C\u2020<sup>1</sup>" ],
   "id": "fi/o:007",
@@ -174,8 +177,8 @@
 },
 { "name": "87 K/95",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "no IF", "h-d" ],
-  "capabilities_other": [ "Acq. NA\u2020" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020" ],
   "note_number": "21",
   "notes": [ "F\u2020" ],
   "id": "fi/o:020",
@@ -183,7 +186,8 @@
 },
 { "name": "90 K/77",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "22\u2020",
   "notes": [ "F\u2020<sup>1</sup>" ],
   "id": "fi/o:021",
@@ -225,7 +229,8 @@
 },
 { "name": "107 K/77(r)",
   "type": "ART",
-  "capabilities": [ "NT", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
+  "capabilities": [ "NT", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "27\u2020",
   "notes": [ "B", "F\u2020<sup>1</sup>" ],
   "id": "fi/o:026",
@@ -268,8 +273,9 @@
 },
 { "name": "7.62 ItKK/31-40",
   "type": "AA",
-  "capabilities": [ "T", "QSU", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "QSU" ],
   "capabilities_other": [ "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "32\u2020",
   "notes": [ "C\u2020<sup>1</sup>" ],
   "id": "fi/o:031",
@@ -297,7 +303,7 @@
   "type": "AA",
   "capabilities": [ "T" ],
   "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF" ] },
-  "capabilities_other": [ "Road MP = 1\u2020" ],
+  "comments": [ "Road MP = 1\u2020" ],
   "note_number": "35\u2020",
   "notes": [ "A", "D", "G\u2020<sup>1</sup>" ],
   "id": "fi/o:034",
diff --git a/vasl_templates/webapp/data/ordnance/french.json b/vasl_templates/webapp/data/ordnance/french.json
index 960108a..879185d 100644
--- a/vasl_templates/webapp/data/ordnance/french.json
+++ b/vasl_templates/webapp/data/ordnance/french.json
@@ -2,7 +2,8 @@
 
 { "name": "LG de 50 mle 37(f)",
   "type": "MTR",
-  "capabilities_other": [ "2PP", "crewed\u2020" ],
+  "capabilities_other": [ "2PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "1",
   "notes": [ "A", "B", "C\u2020", "E" ],
   "id": "fr/o:000",
@@ -54,7 +55,8 @@
   "type": "AT",
   "capabilities": [ "h-d" ],
   "capabilities2": { "LF": [ "NT" ], "HE": 7, "s": 6 },
-  "capabilities_other": [ "ST", "no shield" ],
+  "capabilities_other": [ "ST" ],
+  "comments": [ "no shield" ],
   "note_number": "7",
   "notes": [ "E" ],
   "id": "fr/o:006",
@@ -62,7 +64,8 @@
 },
 { "name": "Canon de 37 mle 16 TR",
   "type": "INF",
-  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "8\u2020<sup>1</sup>",
   "notes": [ "A", "C\u2020" ],
   "id": "fr/o:007",
@@ -70,7 +73,8 @@
 },
 { "name": "Canon de 65 M mle 06",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "9\u2020",
   "notes": [ "A", "P" ],
   "id": "fr/o:008",
@@ -136,14 +140,16 @@
 },
 { "name": "Canon de 155 GPF",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "17\u2020",
   "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>" ],
+  "capabilities": [ "T", "2 TK DR\u2020<sup>1</sup>" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "18\u2020<sup>1</sup>",
   "notes": [ "B", "G\u2020", "V" ],
   "id": "fr/o:017",
diff --git a/vasl_templates/webapp/data/ordnance/german.json b/vasl_templates/webapp/data/ordnance/german.json
index 258cee2..b5857c0 100644
--- a/vasl_templates/webapp/data/ordnance/german.json
+++ b/vasl_templates/webapp/data/ordnance/german.json
@@ -37,7 +37,7 @@
 { "name": "2.8cm sPzB 41",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "uses APCR TK Table\u2020" ],
+  "comments": [ "uses APCR TK Table\u2020" ],
   "note_number": "5\u2020",
   "notes": [ "A\u2020", "N", "P" ],
   "id": "ge/o:004",
@@ -55,7 +55,7 @@
 { "name": "4.2cm lePaK 41",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "uses APCR TK Table\u2020" ],
+  "comments": [ "uses APCR TK Table\u2020" ],
   "note_number": "7",
   "notes": [ "A\u2020", "N<sup>T</sup>" ],
   "id": "ge/o:006",
@@ -202,8 +202,9 @@
 },
 { "name": "17cm K 18",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "AP": 6 },
+  "comments": [ "No IF." ],
   "note_number": "24",
   "notes": [ "N" ],
   "id": "ge/o:023",
diff --git a/vasl_templates/webapp/data/ordnance/italian.json b/vasl_templates/webapp/data/ordnance/italian.json
index bb2c563..cbcc8d7 100644
--- a/vasl_templates/webapp/data/ordnance/italian.json
+++ b/vasl_templates/webapp/data/ordnance/italian.json
@@ -35,8 +35,9 @@
 },
 { "name": "Cannone da 47/32",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities2": { "Towed": [ [null,"A1+"], "\u2020" ] },
+  "comments": [ "No Gunshield." ],
   "note_number": "5\u2020",
   "notes": [ "A", "C", "N" ],
   "id": "it/o:004",
@@ -44,8 +45,9 @@
 },
 { "name": "Cannone da 65/17",
   "type": "INF",
-  "capabilities": [ "NT", "no Gunshield" ],
+  "capabilities": [ "NT" ],
   "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ] },
+  "comments": [ "No Gunshield." ],
   "note_number": "6\u2020",
   "notes": [ "A", "C", "H\u2020<sup>1</sup>", "N" ],
   "id": "it/o:005",
@@ -53,7 +55,8 @@
 },
 { "name": "Cannone da 70/15",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "Acq. NA\u2020<sup>1</sup>", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "Acq. NA\u2020<sup>1</sup>", "No Gunshield." ],
   "note_number": "7\u2020",
   "notes": [ "A", "B\u2020<sup>1</sup>", "<s>R</s>" ],
   "id": "it/o:006",
@@ -122,8 +125,9 @@
 },
 { "name": "Cannone da 149/35",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF", "Acq. NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "s": 8 },
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "15\u2020",
   "notes": [ "B\u2020<sup>1</sup>", "N", "<s>R</s>" ],
   "id": "it/o:014",
diff --git a/vasl_templates/webapp/data/ordnance/japanese.json b/vasl_templates/webapp/data/ordnance/japanese.json
index 6e83617..5e8484f 100644
--- a/vasl_templates/webapp/data/ordnance/japanese.json
+++ b/vasl_templates/webapp/data/ordnance/japanese.json
@@ -38,7 +38,8 @@
 },
 { "name": "Type 97 Medium Close-Attack Gun",
   "type": "MTR",
-  "capabilities": [ "NT", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "5\u2020",
   "notes": [ "A", "C\u2020<sup>1</sup>" ],
   "id": "ja/o:004",
@@ -46,7 +47,8 @@
 },
 { "name": "Type 97 Automatic Gun",
   "type": "ATR",
-  "capabilities_other": [ "5PP", "crew\u2020" ],
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "crew\u2020" ],
   "note_number": "6\u2020",
   "notes": [ "A" ],
   "id": "ja/o:005",
@@ -69,7 +71,8 @@
 },
 { "name": "Year-11 Type Flat-Trajectory Infantry Gun",
   "type": "INF",
-  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "9\u2020",
   "notes": [ "A" ],
   "id": "ja/o:008",
@@ -146,7 +149,7 @@
   "type": "ART",
   "capabilities": [ "NT" ],
   "capabilities2": { "AP": 5, "WP": 5 },
-  "capabilities_other": [ "Towing risk\u2020" ],
+  "comments": [ "Towing risk\u2020" ],
   "note_number": "18\u2020",
   "id": "ja/o:017",
   "gpid": 3297
@@ -162,7 +165,8 @@
 },
 { "name": "Type 93 Twin-Mount High-Angle Machine Gun",
   "type": "AA",
-  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "20\u2020",
   "notes": [ "A", "C\u2020<sup>1</sup>", "E" ],
   "id": "ja/o:019",
diff --git a/vasl_templates/webapp/data/ordnance/russian.json b/vasl_templates/webapp/data/ordnance/russian.json
index da66f76..a021c0d 100644
--- a/vasl_templates/webapp/data/ordnance/russian.json
+++ b/vasl_templates/webapp/data/ordnance/russian.json
@@ -9,7 +9,8 @@
 },
 { "name": "37mm PM-39",
   "type": "MTR",
-  "capabilities_other": [ "1PP", "Air Bursts & Acq. NA" ],
+  "capabilities_other": [ "1PP" ],
+  "comments": [ "Air Bursts & Acq. NA" ],
   "note_number": "1.1",
   "notes": [ "A" ],
   "id": "ru/o:001",
@@ -42,7 +43,8 @@
 },
 { "name": "160mm PM obr. 43",
   "type": "MTR",
-  "capabilities": [ "NT", "no IF" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No IF." ],
   "note_number": "5",
   "id": "ru/o:005",
   "gpid": 512
@@ -189,7 +191,8 @@
 },
 { "name": "203mm B-4 obr. 1931",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "23.1",
   "id": "ru/o:024",
   "gpid": 6995
diff --git 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
index a315518..1725bc4 100644
--- 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
@@ -33,7 +33,7 @@
   "type": "MTR",
   "capabilities": [ "NT" ],
   "capabilities2": { "s": 8, "WP": 7 },
-  "capabilities_other": [ "Towed\u2020" ],
+  "comments": [ "Towed\u2020" ],
   "note_number": "17\u2020",
   "notes": [ "N" ],
   "id": "bcfk/o:003",
diff --git a/vasl_templates/webapp/data/ordnance/un-forces/common.json b/vasl_templates/webapp/data/ordnance/un-forces/common.json
index 06c2e70..afbce56 100644
--- a/vasl_templates/webapp/data/ordnance/un-forces/common.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/common.json
@@ -40,7 +40,8 @@
 { "name": "M20(L) 75mm Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "WP": 7 },
-  "capabilities_other": [ "5PP", "H\u2020", "crewed\u2020" ],
+  "capabilities_other": [ "5PP", "H\u2020" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "25\u2020",
   "notes": [ "K", "M", "O", "P", "R" ],
   "id": "unc/o:004",
diff --git a/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json b/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
index 17a7719..69e33a1 100644
--- a/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
@@ -38,7 +38,8 @@
 { "name": "M18(L) 57mm Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 7, "WP": 6, "C": 7 },
-  "capabilities_other": [ "3PP", "non-crewed\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "non-crewed\u2020" ],
   "note_number": "5\u2020",
   "notes": [ "C", "K", "O" ],
   "id": "uro/o:004",
@@ -73,8 +74,9 @@
 },
 { "name": "M1A1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "AP": 4, "s": 7, "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "9",
   "notes": [ "Y" ],
   "id": "uro/o:008",
@@ -82,7 +84,8 @@
 },
 { "name": "M1 8-in. Howitzer",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "10\u2020",
   "notes": [ "Y" ],
   "id": "uro/o:009",
diff --git a/vasl_templates/webapp/data/vasl-overrides.json b/vasl_templates/webapp/data/vasl-overrides.json
index eccb079..472841b 100644
--- a/vasl_templates/webapp/data/vasl-overrides.json
+++ b/vasl_templates/webapp/data/vasl-overrides.json
@@ -99,6 +99,37 @@
     "updated": {
         "back_images": "fiAA76LB.png"
     }
+},
+
+"adf:1824": {
+    "expected": {
+        "name": "37L AT PTP obr. 30",
+        "front_images": "ru/gun/ruAT37L",
+        "back_images": "ru/gun/ruAT37Lb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37LPTPobr30.png"
+    }
+},
+"adf:1822": {
+    "expected": {
+        "name": "37* INF PP obr. 15R",
+        "front_images": "ru/gun/ruINF37s",
+        "back_images": "ru/gun/ruINF37sb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37PPobr15R.png"
+    }
+},
+"adf:1823": {
+    "expected": {
+        "name": "76* INF PP obr. 27",
+        "front_images": "ru/gun/ruINF76s",
+        "back_images": "ru/gun/ruINF76sb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru76PPobr27.png"
+    }
 }
 
 }
diff --git a/vasl_templates/webapp/data/vehicles/chinese~gmd.json b/vasl_templates/webapp/data/vehicles/chinese~gmd.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/vasl_templates/webapp/data/vehicles/chinese~gmd.json
@@ -0,0 +1 @@
+[]
diff --git a/vasl_templates/webapp/file_server/utils.py b/vasl_templates/webapp/file_server/utils.py
index 9b3a436..31b7f03 100644
--- a/vasl_templates/webapp/file_server/utils.py
+++ b/vasl_templates/webapp/file_server/utils.py
@@ -31,14 +31,18 @@ def get_vo_gpids( data_dir, extns ): #pylint: disable=too-many-locals,too-many-b
                             gpids.add( get_effective_gpid( str(gpid) ) )
 
     # process any extensions
-    if extns:
+    if extns: #pylint: disable=too-many-nested-blocks
         for extn in extns:
             extn_info = extn[1]
-            for vo_type in ["vehicles","ordnance"]:
-                if vo_type not in extn_info:
+            for nat in extn_info:
+                if not isinstance( extn_info[nat], dict ):
                     continue
-                for piece in extn_info[vo_type]:
-                    gpids.update( piece["gpid"] )
+                for vo_type in ("vehicles","ordnance"):
+                    for piece in extn_info[ nat ].get( vo_type, [] ):
+                        if isinstance( piece["gpid"], list ):
+                            gpids.update( piece["gpid"] )
+                        else:
+                            gpids.add( piece["gpid"] )
 
     return gpids
 
diff --git a/vasl_templates/webapp/file_server/vasl_mod.py b/vasl_templates/webapp/file_server/vasl_mod.py
index 6d0427a..2a6361f 100644
--- a/vasl_templates/webapp/file_server/vasl_mod.py
+++ b/vasl_templates/webapp/file_server/vasl_mod.py
@@ -65,7 +65,7 @@ def set_vasl_mod( vmod_fname, msg_store ):
         else:
             _vasl_mod = None
 
-def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-statements
+def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-statements,too-many-branches
     """Locate VASL extensions and their corresponding vehicle/ordnance info files."""
 
     if not extn_dir:
@@ -90,7 +90,7 @@ def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-stat
         _logger.debug( "- id=%s ; version=%s", extn_info["extensionId"], extn_info["version"] )
 
     # figure out what filename extensions we will recognize
-    valid_fname_extns = app.config.get( "VASL_EXTENSION_FILENAME_EXTNS", ".mdx .zip" )
+    valid_fname_extns = app.config.get( "VASL_EXTENSION_FILENAME_EXTNS", ".mdx .vmdx .zip" )
     valid_fname_extns = valid_fname_extns.replace( ";", " " ).replace( ",", " " ).split()
 
     # process each VASL extension
@@ -143,6 +143,12 @@ def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-stat
         _logger.info( "Accepting VASL extension: %s (%s/%s)", os.path.split(extn_fname)[1], extn_id, extn_version )
         extns.append( ( extn_fname, extn_info ) )
 
+        # add any child extensions
+        for extn_info2 in all_extn_info.values():
+            if extn_info2.get( "parentExtensionId" ) == extn_info["extensionId"] \
+               and extn_info2["version"] == extn_info["version"]:
+                extns.append( ( extn_fname, extn_info2 ) )
+
     return extns
 
 # ---------------------------------------------------------------------
@@ -297,6 +303,9 @@ class VaslMod:
                 del vasl_overrides[ gpid ]
 
             # save the loaded entry
+            for attr in ("front_images","back_images"):
+                if isinstance( piece[attr], list ) and not piece[attr]:
+                    piece[attr] = None
             self._pieces[ gpid ] = piece
             target_gpids.remove( gpid )
             _logger.debug( "- Loaded piece: %s", piece )
@@ -327,6 +336,8 @@ class VaslMod:
         def is_image_path( val ): #pylint: disable=missing-docstring
             if val == "white X 60.png": # nb: a lot of Finnish pieces have this
                 return False
+            if "-malf-" in val:
+                return False
             if val.endswith( (".gif",".png") ):
                 return True
             if val.startswith( ("ru/","ge/","am/","br/","it/","ja/","ch/","sh/","fr/","al/","ax/","hu/","fi/") ):
@@ -382,6 +393,13 @@ class VaslMod:
                 )
                 front_images.pop()
                 assert not back_images
+            elif front_images[-1].endswith( "-BFPb.png" ) and front_images[0] == front_images[-1][:-9]+"-BFP.png":
+                # nb: this is for Polish Guns (Poland In Flames)
+                _logger.debug( "Ignoring limbered images: gpid=%s, front=%s, back=%s",
+                    gpid, front_images, back_images
+                )
+                front_images.pop()
+                assert not back_images
 
         def delistify( val ): #pylint: disable=missing-docstring
             if val is None:
diff --git a/vasl_templates/webapp/snippets.py b/vasl_templates/webapp/snippets.py
index bde5a5b..8c89f41 100644
--- a/vasl_templates/webapp/snippets.py
+++ b/vasl_templates/webapp/snippets.py
@@ -138,33 +138,41 @@ def make_snippet_image():
 
 # ---------------------------------------------------------------------
 
-_flag_image_cache = {}
-_flag_image_cache_lock = threading.Lock()
-
 @app.route( "/flags/<nat>" )
 def get_flag( nat ):
     """Get a flag image."""
+    return _get_small_image(
+        "static/images/flags/", nat,
+        app.config.get( "DEFAULT_FLAG_HEIGHT", 11 )
+    )
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+_small_image_cache = {}
+_small_image_cache_lock = threading.Lock()
+
+def _get_small_image( base_dir, key, default_height ):
+    """Get a small image (cached)."""
 
-    # validate the nationality
-    if not re.search( "^[-a-z]+$", nat ):
+    # locate the image file
+    if not re.search( "^[-a-z~]+$", key ):
         abort( 404 )
+    fname = os.path.join( base_dir, key+".png" )
 
     # check how we should resize the image
     # NOTE: Resizing images in the HTML snippets looks dreadful (presumably
     # because VASSAL's HTML engine is so ancient), so we do it ourself :-/
-    default_height = app.config.get( "DEFAULT_FLAG_HEIGHT", 11 )
     height = int( request.args.get( "height", default_height ) )
     if height <= 0:
         abort( 400 )
 
-    with _flag_image_cache_lock:
+    with _small_image_cache_lock:
 
         # check if we have the image in the cache
-        cache_key = ( nat, height )
-        if cache_key not in _flag_image_cache:
+        cache_key = ( key, height )
+        if cache_key not in _small_image_cache:
 
             # nope - load it
-            fname = "static/images/flags/{}.png".format( nat )
             with app.open_resource( fname, "rb" ) as fp:
                 img = Image.open( fp )
                 # resize the image
@@ -177,8 +185,8 @@ def get_flag( nat ):
                 buf = io.BytesIO()
                 img.save( buf, format="PNG" )
                 buf.seek( 0 )
-                _flag_image_cache[ cache_key ] = buf.read()
+                _small_image_cache[ cache_key ] = buf.read()
 
         # return the flag image
-        img_data =_flag_image_cache[ cache_key ]
+        img_data =_small_image_cache[ cache_key ]
         return send_file( io.BytesIO(img_data), mimetype="image/png" )
diff --git a/vasl_templates/webapp/static/css/edit-vo-dialog.css b/vasl_templates/webapp/static/css/edit-vo-dialog.css
index 1300d86..73a9938 100644
--- a/vasl_templates/webapp/static/css/edit-vo-dialog.css
+++ b/vasl_templates/webapp/static/css/edit-vo-dialog.css
@@ -1,23 +1,24 @@
-.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; }
+.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; flex-direction: column ; }
 .ui-dialog.edit-vo .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; }
 
-.ui-dialog.edit-vo .capabilities { flex-grow: 1 ; display: flex ; flex-direction: column ; }
+.ui-dialog.edit-vo .header { display: flex ; align-items: center ; margin-bottom: 0.5em ; }
+.ui-dialog.edit-vo .header img.vasl-image { height: 3.5em ; margin-right: 0.5em ; }
+.ui-dialog.edit-vo .header img.vasl-image.small-piece { height: 2.7em ; margin-left: 0.4em ; margin-right: 0.9em ; }
+.ui-dialog.edit-vo .header .content { display: flex ; flex-direction: column ; justify-content: center ; }
+.ui-dialog.edit-vo .header .content .vo-name { font-size: 125% ; }
+.ui-dialog.edit-vo .header .content input.select-vo-image { width: 15px ; position: relative ; top: 10px ; }
 
-.ui-dialog.edit-vo .capabilities .header { display: flex ; align-items: center ; margin-bottom: 0.5em ; }
-.ui-dialog.edit-vo .capabilities .header img.vasl-image { height: 3.5em ; margin-right: 0.5em ; }
-.ui-dialog.edit-vo .capabilities .header img.vasl-image.small-piece { height: 2.7em ; margin-left: 0.4em ; margin-right: 0.9em ; }
-.ui-dialog.edit-vo .capabilities .header .content { display: flex ; flex-direction: column ; justify-content: center ; }
-.ui-dialog.edit-vo .capabilities .header .content .vo-name { font-size: 125% ; }
-.ui-dialog.edit-vo .capabilities .header .content input.select-vo-image { width: 15px ; position: relative ; top: 10px ; }
+.ui-dialog.edit-vo .capabilities { flex-grow: 1 ; }
+.ui-dialog.edit-vo .comments { flex-grow: 1 ; }
 
-.ui-dialog.edit-vo .capabilities div.fieldset { flex-grow: 1 ; display: flex ; flex-direction: column ; align-items: stretch ; }
-.ui-dialog.edit-vo .capabilities div.fieldset { margin: 0 ; padding: 5px 8px 8px 8px ; border: 1px solid #aaa ; }
-.ui-dialog.edit-vo .capabilities div.fieldset-legend { color: #666 ; }
-.ui-dialog.edit-vo .capabilities div.fieldset ul { flex-grow: 1 ; margin: 0 0 5px 0 ; list-style-type: none ; overflow-y: auto ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li { height: 1.5em ; margin: 2px ; padding: 2px 0px 2px 5px ; background: #eee ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li div { display: flex ; align-items: center ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li img.dragger { height: 1em ; margin-right: 5px ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li input[type='text'] { flex-grow: 1 ; margin-right: 1em ; }
+.ui-dialog.edit-vo .fieldset { height: calc(100% - 40px) ; display: flex ; flex-direction: column ; align-items: stretch ; }
+.ui-dialog.edit-vo .fieldset { margin: 0 ; padding: 5px 8px 8px 8px ; border: 1px solid #aaa ; }
+.ui-dialog.edit-vo .fieldset-legend { color: #666 ; }
+.ui-dialog.edit-vo .fieldset ul { flex-grow: 1 ; margin: 0 0 5px 0 ; list-style-type: none ; overflow-y: auto ; }
+.ui-dialog.edit-vo .fieldset li { margin: 2px ; padding: 2px 0px 2px 5px ; background: #eee ; }
+.ui-dialog.edit-vo .fieldset li div { display: flex ; align-items: center ; }
+.ui-dialog.edit-vo .fieldset li img.dragger { height: 1em ; margin-right: 5px ; }
+.ui-dialog.edit-vo .fieldset li input[type='text'] { flex-grow: 1 ; margin-right: 1em ; }
 
-.ui-dialog.edit-vo .capabilities div.fieldset .footer { display: flex ; align-items: center ; }
-.ui-dialog.edit-vo .capabilities div.fieldset .footer img.trash { margin: 3px 5px ; height: 24px ; }
+.ui-dialog.edit-vo .fieldset .footer { display: flex ; align-items: center ; }
+.ui-dialog.edit-vo .fieldset .footer img.trash { margin: 3px 5px ; height: 24px ; }
diff --git a/vasl_templates/webapp/static/images/flags/anzac.png b/vasl_templates/webapp/static/images/flags/anzac.png
new file mode 100644
index 0000000..d1d1e30
Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/anzac.png differ
diff --git a/vasl_templates/webapp/static/images/flags/burmese.png b/vasl_templates/webapp/static/images/flags/burmese.png
new file mode 100644
index 0000000..93877b8
Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/burmese.png differ
diff --git a/vasl_templates/webapp/static/images/flags/chinese-gmd.png b/vasl_templates/webapp/static/images/flags/chinese~gmd.png
similarity index 100%
rename from vasl_templates/webapp/static/images/flags/chinese-gmd.png
rename to vasl_templates/webapp/static/images/flags/chinese~gmd.png
diff --git a/vasl_templates/webapp/static/images/flags/filipino.png b/vasl_templates/webapp/static/images/flags/filipino.png
new file mode 100644
index 0000000..466e25a
Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/filipino.png differ
diff --git a/vasl_templates/webapp/static/images/flags/indonesian.png b/vasl_templates/webapp/static/images/flags/indonesian.png
new file mode 100644
index 0000000..a9a6c45
Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/indonesian.png differ
diff --git a/vasl_templates/webapp/static/images/flags/polish.png b/vasl_templates/webapp/static/images/flags/polish.png
index 6133139..bd87568 100644
Binary files a/vasl_templates/webapp/static/images/flags/polish.png and b/vasl_templates/webapp/static/images/flags/polish.png differ
diff --git a/vasl_templates/webapp/static/images/flags/slovakian.png b/vasl_templates/webapp/static/images/flags/slovakian.png
index 79b78c6..6c8c9eb 100644
Binary files a/vasl_templates/webapp/static/images/flags/slovakian.png and b/vasl_templates/webapp/static/images/flags/slovakian.png differ
diff --git a/vasl_templates/webapp/static/images/flags/thai.png b/vasl_templates/webapp/static/images/flags/thai.png
new file mode 100644
index 0000000..c25de6a
Binary files /dev/null and b/vasl_templates/webapp/static/images/flags/thai.png differ
diff --git a/vasl_templates/webapp/static/images/spacer.png b/vasl_templates/webapp/static/images/spacer.png
new file mode 100644
index 0000000..890b8f4
Binary files /dev/null and b/vasl_templates/webapp/static/images/spacer.png differ
diff --git a/vasl_templates/webapp/static/main.js b/vasl_templates/webapp/static/main.js
index 043beda..e3e85b6 100644
--- a/vasl_templates/webapp/static/main.js
+++ b/vasl_templates/webapp/static/main.js
@@ -186,21 +186,23 @@ $(document).ready( function () {
         restrict_droplist_height( $sel ) ;
     }
     function format_player_droplist_item( opt ) {
-        var url = gImagesBaseUrl + "/flags/" + opt.id + ".png" ;
+        if ( ! opt.id )
+            return opt.text ;
+        var url = make_player_flag_url( opt.id ) ;
         return $( "<div style='display:flex;align-items:center;'>" +
             "<img src='" + url + "' style='height:0.9em;margin-right:0.25em;'>" +
             " " + opt.text +
         "</div>" ) ;
     }
     init_select2( $( "select[name='PLAYER_1']" ),
-        "9em", false, format_player_droplist_item
+        "9.5em", false, format_player_droplist_item
     ).on( "select2:open", function() {
         on_player_droplist_open( $(this) ) ;
     } ).on( "change", function() {
         on_player_change_with_confirm( 1 ) ;
     } ) ;
     init_select2( $( "select[name='PLAYER_2']" ),
-        "9em", false, format_player_droplist_item
+        "9.5em", false, format_player_droplist_item
     ).on( "select2:open", function() {
         on_player_droplist_open( $(this) ) ;
     } ).on( "change", function() {
@@ -648,7 +650,7 @@ function update_ob_tab_header( player_no )
     // update the OB tab header for the specified player
     var player_nat = $( "select[name='PLAYER_" + player_no + "']" ).val() ;
     var display_name = get_nationality_display_name( player_nat ) ;
-    var image_url = gImagesBaseUrl + "/flags/" + player_nat + ".png" ;
+    var image_url = make_player_flag_url( player_nat ) ;
     var $elem = $( "#tabs .ui-tabs-nav a[href='#tabs-ob" + player_no + "']" ) ;
     $elem.html(
         "<img src='" + image_url + "'>&nbsp;" +
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index 683a581..4794d51 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -14,6 +14,20 @@ var _DAY_OF_MONTH_POSTFIXES = { // nb: we assume English :-/
     11: "th", 12: "th", 13: "th"
 } ;
 
+// NOTE: Blood & Jungle has a lot of multi-applicable notes that simply refer to other
+// multi-applicable notes e.g. "Fr C" = "French Multi-Applicable Note C".
+var BFP_MA_NOTE_REDIRECTS = {
+    "Br": "british",
+    "Ch": "chinese",
+    "Fr": "french",
+    "Ge": "german",
+    "Jp": "japanese",
+    "Ru": "russian",
+    "US": "american",
+    "AllM": "allied-minor",
+    "AxM": "axis-minor",
+} ;
+
 var gDefaultScenario = null ;
 var gLastSavedScenario = null ;
 var gLastSavedScenarioFilename = null ;
@@ -158,16 +172,42 @@ function make_snippet( $btn, params, extra_params, show_date_warnings )
         set_vo_note( "ordnance" ) ;
 
     // generate snippets for multi-applicable vehicle/ordnance notes
+    var pos ;
+    function redirect_ma_note( target, vo_type ) {
+        pos = target.indexOf( " " ) ;
+        var nat_redirect = BFP_MA_NOTE_REDIRECTS[ target.substring( 0, pos ) ] ;
+        if ( nat_redirect )
+            return get_ma_notes_for_nat( nat_redirect, vo_type )[ target.substring(pos+1 ) ] ;
+        return null ;
+    }
     function add_ma_notes( ma_notes, keys, param_name, nat, vo_type ) {
         if ( ! keys )
             return ;
         params[ param_name ] = [] ;
         for ( var i=0 ; i < keys.length ; ++i ) {
-            var ma_note = ma_notes[ keys[i] ] ;
+            var ma_note = null ;
+            if ( keys[i].substring( 0, 4 ) == "adf:" )
+                ma_note = redirect_ma_note( keys[i].substring(4), vo_type ) ;
+            else if ( keys[i].substring( 0, 6 ) == "cobra:" )
+                ma_note = redirect_ma_note( keys[i].substring(6), vo_type ) ;
+            else if ( keys[i].substring( 0, 4 ) == "pif:" )
+                ma_note = redirect_ma_note( keys[i].substring(4), vo_type ) ;
+            if ( ! ma_note )
+                ma_note = ma_notes[ keys[i] ] ;
+            var key = keys[i] ;
+            var extn_marker = "" ;
+            if ( nat === "italian" && vo_type === "ordnance" && keys[i] === "R" )
+                key = "<s>R</s>" ;
+            else {
+                pos = key.indexOf( ":" ) ;
+                if ( pos !== -1 ) {
+                    extn_marker = "&#x2756; " ;
+                    key = key.substring( pos+1 ) ;
+                }
+            }
             params[ param_name ].push(
-                "<span class='key'>" +
-                (nat === "italian" && vo_type === "ordnance" && keys[i] === "R" ? "<s>R</s>" : keys[i]) + ":" +
-                "</span> " +
+                extn_marker +
+                "<span class='key'>" + key + ":" + "</span> " +
                 (ma_note || "Unavailable.")
             ) ;
         }
@@ -304,6 +344,7 @@ function make_snippet( $btn, params, extra_params, show_date_warnings )
     // add in any extra parameters
     if ( extra_params )
         $.extend( true, params, extra_params ) ;
+    params.IMAGES_BASE_URL = APP_URL_BASE + gImagesBaseUrl ;
 
     // check that the players have different nationalities
     if ( params.PLAYER_1 === params.PLAYER_2 )
@@ -361,7 +402,12 @@ function get_vo_note_key( vo_entry )
         return null ;
     // nb: there are some note numbers of the form "1.2" :-/
     var match = vo_entry.note_number.match( new RegExp( "^([0-9.]+)" ) ) ;
-    return match ? match[1] : null ;
+    if ( ! match )
+        return null ;
+    var key = match[1] ;
+    if ( vo_entry.extn_id )
+        key = vo_entry.extn_id + ":" + key ;
+    return key ;
 }
 
 function is_known_vo_note_key( vo_type, nat, key )
@@ -389,6 +435,9 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
         new RegExp( "^([A-Z][a-z])$" ),
         new RegExp( "^([A-Za-z])<sup>" ),
         new RegExp( "^<s>([A-Za-z])</s>$" ),
+        // NOTE: There are BFP references like "Jp 5", but we ignore these since they are referring to
+        // a vehicle/ordnance *note*, not a multi-applicable note.
+        new RegExp( "^((Br|Ch|Fr|Ge|Jp|Ru|US|AllM|AxM) [A-Z]{1,2})(\\u2020(<sup>\\d</sup>)?)?$" ),
     ] ;
     var EXTRA_NOTES_INFO = {
         "alc/v": [ "allied-minor", "Allied Minor Common Vehicles" ],
@@ -404,6 +453,10 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
         if ( ! vo_entry.notes )
             continue ;
         for ( j=0 ; j < vo_entry.notes.length ; ++j ) {
+            if ( vo_entry.notes[j] === "US <s>P</s>" ) { // nb: can't do this with a regex
+                keys[0][ vo_entry.extn_id + ":US P" ] = true ;
+                continue ;
+            }
             var rc = false ;
             for ( k=0 ; k < regexes.length ; ++k ) {
                 var match = vo_entry.notes[j].match( regexes[k] ) ;
@@ -411,7 +464,14 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
                     var vo_id = vo_entry.id.split( ":", 1 )[0] ;
                     var is_extra = ["allied-minor","axis-minor","landing-craft"].indexOf( nat ) === -1 &&
                                    ["alc/v","alc/o","axc/v","axc/o","sh/v"].indexOf( vo_id ) !== -1 ;
-                    keys[ is_extra?1:0 ][ match[1] ] = true ;
+                    var key = match[1] ;
+                    if ( vo_entry.extn_id && !( vo_entry.extn_id === "adf" && nat === "american" && key.length === 1 ) ) {
+                        // NOTE: We include the extension ID as part of the key, except for BFP American vehicles,
+                        // whose multi-applicable notes refer to the main American multi-applicable notes,
+                        // not the BFP ones (there aren't any).
+                        key = vo_entry.extn_id + ":" + key ;
+                    }
+                    keys[ is_extra?1:0 ][ key ] = true ;
                     if ( is_extra ) {
                         // NOTE: Only the Americans/British and Japanese have landing craft, while Axis Minor Powers
                         // will never have Allied Minor common vehicles/ordnance (and vice versa), so if we have
@@ -552,6 +612,8 @@ function unload_snippet_params( unpack_scenario_date, template_id )
                 note_number: vo_entry.note_number,
                 notes: vo_entry.notes
             } ;
+            if ( vo_entry.extn_id )
+                obj.extn_id = vo_entry.extn_id ;
             if ( gUserSettings["include-vasl-images-in-snippets"] ) {
                 var url = get_vo_image_url( vo_entry, vo_image_id ) ;
                 if ( url )
@@ -589,6 +651,13 @@ function unload_snippet_params( unpack_scenario_date, template_id )
             ) ;
             if ( capabilities )
                 obj.raw_capabilities = capabilities ;
+            var comments = $(this).data( "sortable2-data" ).custom_comments ;
+            if ( comments ) {
+                obj.comments = comments ;
+                obj.custom_comments = comments.slice() ;
+            } else {
+                obj.comments = vo_entry.comments ;
+            }
             objs.push( obj ) ;
         } ) ;
         if ( objs.length > 0 )
@@ -652,7 +721,7 @@ function make_capabilities( raw, vo_entry, nat, scenario_theater, scenario_year,
                 capabilities[ capabilities.length-1 ] += " [" + caps.join(", ") + "]" ;
                 continue ;
             }
-            if ( $.inArray( key, ["HE","AP","A","D","C","H","B","s","sM","sD","sN","WP","IR","Towed"] ) === -1 ) {
+            if ( $.inArray( key, ["HE","AP","A","D","C","H","B","S","s","sM","sD","sN","WP","IR","Towed"] ) === -1 ) {
                 unexpected_caps.push( key ) ;
                 continue ;
             }
@@ -825,6 +894,13 @@ function _check_capability_timestamp( capabilities, timestamp, nat, scenario_the
     }
 
     // parse the month/year the capability becomes available
+    var match = timestamp.match( /^(\d+)-$/ ) ;
+    if ( match ) {
+        if ( scenario_year < 1900 + parseInt(match[1]) )
+            return capabilities[0] ;
+        else
+            return "" ;
+    }
     var month = MONTH_NAMES[ timestamp.substring(0,1) ] ;
     if ( month )
         timestamp = timestamp.substring( 1 ) ;
@@ -1127,7 +1203,7 @@ function do_load_scenario_data( params )
                         warnings.push( "Invalid V/O image ID for '" + params[key][i].name + "': " + params[key][i].image_id ) ;
                 }
                 if ( vo_entry )
-                    do_add_vo( vo_type, player_no, vo_entry, vo_image_id, params[key][i].custom_capabilities, params[key][i].seq_id ) ;
+                    do_add_vo( vo_type, player_no, vo_entry, vo_image_id, params[key][i].custom_capabilities, params[key][i].custom_comments, params[key][i].seq_id ) ;
                 else
                     unknown_vo.push( vo_id || "(not set)" ) ;
             }
@@ -1286,6 +1362,8 @@ function unload_params_for_save( user_requested )
                 entry.image_id = params[key][i].image_id ;
             if ( params[key][i].custom_capabilities )
                 entry.custom_capabilities = params[key][i].custom_capabilities ;
+            if ( params[key][i].custom_comments )
+                entry.custom_comments = params[key][i].custom_comments ;
             entries.push( entry ) ;
         }
         params[key] = entries ;
diff --git a/vasl_templates/webapp/static/sortable.js b/vasl_templates/webapp/static/sortable.js
index 29cf354..a0d83e9 100644
--- a/vasl_templates/webapp/static/sortable.js
+++ b/vasl_templates/webapp/static/sortable.js
@@ -6,6 +6,7 @@ SORTABLE_DISPLAY_NAMES = {
     ob_vehicles: [ "vehicle", "vehicles", "a" ],
     ob_ordnance: [ "ordnance", "ordnance", "an" ],
     vo_capabilities: [ "capability", "capabilities", "a" ],
+    vo_comments: [ "comment", "comments", "a" ],
 } ;
 
 SORTABLE_HINTS = {
diff --git a/vasl_templates/webapp/static/utils.js b/vasl_templates/webapp/static/utils.js
index 9d1d3ba..183db02 100644
--- a/vasl_templates/webapp/static/utils.js
+++ b/vasl_templates/webapp/static/utils.js
@@ -316,7 +316,7 @@ function add_flag_to_dialog_titlebar( $dlg, player_no )
     if ( ! player_nat )
         return ;
     var $titlebar = $dlg.dialog( "instance" ).uiDialogTitlebar ;
-    var url = gImagesBaseUrl + "/flags/" + player_nat + ".png" ;
+    var url = make_player_flag_url( player_nat ) ;
     $titlebar.find( ".ui-dialog-title" ).prepend(
         $( "<img src='" + url + "' class='flag'>" )
     ).css( { display: "flex", "align-items": "center" } ) ;
diff --git a/vasl_templates/webapp/static/vo.js b/vasl_templates/webapp/static/vo.js
index 29bab36..2657848 100644
--- a/vasl_templates/webapp/static/vo.js
+++ b/vasl_templates/webapp/static/vo.js
@@ -15,7 +15,7 @@ function add_vo( vo_type, player_no )
     var nat = $( "select[name='PLAYER_" + player_no + "']" ).val() ;
     var entries = gVehicleOrdnanceListings[vo_type][nat] ;
     if ( entries === undefined ) {
-        showErrorMsg( "There are no " + get_nationality_display_name(nat) + " " + vo_type + " listings." ) ;
+        showWarningMsg( "There are no " + get_nationality_display_name(nat) + " " + vo_type + " listings." ) ;
         return ;
     }
     var buf = [] ;
@@ -117,7 +117,7 @@ function add_vo( vo_type, player_no )
                     usedIds[ $(this).data( "sortable2-data" ).id ] = true ;
                 } ) ;
                 var seq_id = auto_assign_id( usedIds, "seq_id" ) ;
-                do_add_vo( vo_type, player_no, entries[sel_index], vo_image_id, null, seq_id ) ;
+                do_add_vo( vo_type, player_no, entries[sel_index], vo_image_id, null, null, seq_id ) ;
                 $(this).dialog( "close" ) ;
             },
             Cancel: function() { $(this).dialog( "close" ) ; },
@@ -127,7 +127,7 @@ function add_vo( vo_type, player_no )
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabilities, seq_id )
+function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabilities, custom_comments, seq_id )
 {
     // add the specified vehicle/ordnance
     // NOTE: We set a fixed height for the sortable2 entries (based on the CSS settings in tabs-ob.css),
@@ -149,6 +149,8 @@ function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabiliti
     } ;
     if ( custom_capabilities )
         data.custom_capabilities = custom_capabilities ;
+    if ( custom_comments )
+        data.custom_comments = custom_comments ;
     data.id = seq_id ;
     var buf = [ div_tag,
         "<img class='vasl-image'>",
@@ -177,7 +179,8 @@ function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabiliti
             "<img src='" + gImagesBaseUrl + "/snippet.png'",
             " class='snippet' data-id='" + template_id + "' title='" + GENERATE_SNIPPET_HINT + "'>"
         ) ;
-        data.vo_note_url = APP_URL_BASE + "/" + vo_type + "/" + vo_nat + "/note/" + vo_note_key ;
+        var url = APP_URL_BASE + "/" + vo_type + "/" + vo_nat + "/note/" ;
+        data.vo_note_url = url + vo_note_key ;
     }
     buf.push( "</div>" ) ;
     var $content = $( buf.join("") ) ;
diff --git a/vasl_templates/webapp/static/vo2.js b/vasl_templates/webapp/static/vo2.js
index 0e11d43..7aae2f9 100644
--- a/vasl_templates/webapp/static/vo2.js
+++ b/vasl_templates/webapp/static/vo2.js
@@ -15,13 +15,34 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
             show_warnings
         ) ;
     }
+    function get_default_comments( vo_entry ) {
+        return vo_entry.comments ? vo_entry.comments : [] ;
+    }
 
-    // get the vehicle/ordnance's capabilities
+    function load_entries( $sortable, entries ) {
+        $sortable.sortable2( "delete-all" ) ;
+        for ( var i=0 ; i < entries.length ; ++i )
+            add_entry( $sortable, entries[i], false ) ;
+    }
+    function unload_entries( $sortable ) {
+        var entries = [] ;
+        $sortable.find( "input[type='text']" ).each( function() {
+            var val = $(this).val().trim() ;
+            if ( val )
+                entries.push( val ) ;
+        } ) ;
+        return entries ;
+    }
+
+    // get the vehicle/ordnance's capabilities/comments
     var params = unload_snippet_params( true, null ) ;
     var vo_entry = $entry.data( "sortable2-data" ).vo_entry ;
     var capabilities = $entry.data( "sortable2-data" ).custom_capabilities ;
     if ( ! capabilities )
         capabilities = get_default_capabilities( vo_entry, params, true ).slice() ;
+    var comments = $entry.data( "sortable2-data" ).custom_comments ;
+    if ( ! comments )
+        comments = get_default_comments( vo_entry ) ;
 
     // load the dialog
     var vo_image_id = $entry.data( "sortable2-data" ).vo_image_id ;
@@ -50,7 +71,8 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
 
     // initialize
     var $capabilities = $( "#vo_capabilities-sortable" ) ;
-    function add_capability( val ) {
+    var $comments = $( "#vo_comments-sortable" ) ;
+    function add_entry( $sortable, val, visible ) {
         var $elem = $( "<div>" +
             "<img class='dragger' src='" + gImagesBaseUrl + "/dragger.png'>" +
             "<input type='text'>" +
@@ -59,42 +81,53 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
         $elem.children( "input[type='text']" ).val( val ).keydown( function(evt) {
             auto_dismiss_dialog( $dlg, evt, "OK" ) ;
         } ) ;
-        return $capabilities.sortable2( "add", {
+        var $entry = $sortable.sortable2( "add", {
             content: $elem,
-            data: { fixed_height: "1.4em" },
+            data: { fixed_height: "1.5em" },
         } ) ;
+        if ( visible ) {
+            $entry.find( "input[type='text']" ).focus() ;
+            $entry[0].scrollIntoView() ;
+        }
     }
 
-    // NOTE: on_reset_capabilities() gets bound when the sortable2 is *created*, so it needs some way
-    // to get the *current* vo_entry and params, otherwise it will use the values active when it was bound.
-    var $reset = $( "#vo_capabilities-reset" ) ;
-    $reset.data( { vo_entry: vo_entry, params: params } ) ;
+    // NOTE: on_reset_capabilities/comments() get bound when the sortable2 is *created*, so they need some way
+    // to get the *current* vo_entry and params, otherwise they will use the values active when they were bound.
+    var $reset_capabilities = $( "#vo_capabilities-reset" ) ;
+    $reset_capabilities.data( { vo_entry: vo_entry, params: params } ) ;
     function on_reset_capabilities() {
-        $capabilities.sortable2( "delete-all" ) ;
-        var capabilities = get_default_capabilities( $reset.data("vo_entry"), $reset.data("params"), false ) ;
-        for ( var i=0 ; i < capabilities.length ; ++i )
-            add_capability( capabilities[i] ) ;
+        load_entries( $capabilities,
+            get_default_capabilities( $reset_capabilities.data("vo_entry"), $reset_capabilities.data("params"), false )
+        ) ;
+    }
+    var $reset_comments = $( "#vo_comments-reset" ) ;
+    $reset_comments.data( { vo_entry: vo_entry, params: params } ) ;
+    function on_reset_comments() {
+        load_entries( $comments,
+            get_default_comments( $reset_comments.data("vo_entry") )
+        ) ;
     }
 
     // show the dialog
     var $dlg = $( "#edit-vo" ).dialog( {
         dialogClass: "edit-vo",
         title: "Edit "+vo_type,
-        minWidth: 350,
-        minHeight: 340,
+        minWidth: 550,
+        minHeight: 470,
         modal: true,
         create: function() {
             // initialize the dialog
             init_dialog( $(this), "OK", false ) ;
             $capabilities.sortable2( "init", {
-                add: function() {
-                    $elem = add_capability( "" ) ;
-                    $elem.find( "input[type='text']" ).focus() ;
-                    $elem[0].scrollIntoView() ;
-                },
+                add: function() { add_entry( $capabilities, "", true ) ; },
                 reset: on_reset_capabilities,
                 no_confirm_delete: true,
             } ) ;
+            $comments.sortable2( "init", {
+                add: function() { add_entry( $comments, "", true ) ; },
+                reset: on_reset_comments,
+                no_confirm_delete: true,
+            } ) ;
         },
         open: function() {
             // initialize
@@ -107,9 +140,8 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
                 border: "1px solid "+colors[2],
             } ) ;
             // load the dialog
-            $capabilities.sortable2( "delete-all" ) ;
-            for ( var i=0 ; i < capabilities.length ; ++i )
-                add_capability( capabilities[i] ) ;
+            load_entries( $capabilities, capabilities ) ;
+            load_entries( $comments, comments ) ;
         },
         buttons: {
             OK: function() {
@@ -119,18 +151,22 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
                 if ( vo_image_id )
                     $entry.data( "sortable2-data" ).vo_image_id = vo_image_id ;
                 // unload the capabilities
-                var capabilities = [] ;
-                $capabilities.find( "input[type='text']" ).each( function() {
-                    var val = $(this).val().trim() ;
-                    if ( val )
-                        capabilities.push( val ) ;
-                } ) ;
+                var capabilities = unload_entries( $capabilities ) ;
                 if ( capabilities.join() !== get_default_capabilities( vo_entry, params, false ).join() )
                     $entry.data( "sortable2-data" ).custom_capabilities = capabilities ;
                 else {
                     // the capabilities are the same as the default - no need to retain these custom settings
                     delete $entry.data( "sortable2-data" ).custom_capabilities ;
                 }
+                // unload the comments
+                var comments = unload_entries( $comments ) ;
+                if ( comments.join() !== get_default_comments( vo_entry ).join() ) {
+                    $entry.data( "sortable2-data" ).custom_comments = comments ;
+                }
+                else {
+                    // the comments are the same as the default - no need to retain these custom settings
+                    delete $entry.data( "sortable2-data" ).custom_comments ;
+                }
                 // update the original V/O entry to reflect the changes
                 update_vo_sortable2_entry( $entry ) ;
                 $(this).dialog( "close" ) ;
diff --git a/vasl_templates/webapp/templates/edit-vo-dialog.html b/vasl_templates/webapp/templates/edit-vo-dialog.html
index e2023f6..c1443c1 100644
--- a/vasl_templates/webapp/templates/edit-vo-dialog.html
+++ b/vasl_templates/webapp/templates/edit-vo-dialog.html
@@ -1,9 +1,8 @@
 <div id="edit-vo" style="display:none;">
 
-<div class="capabilities">
-
-    <div class="header"></div>
+<div class="header"></div>
 
+<div class="capabilities">
     <div class="fieldset-legend">Capabilities:</div>
     <div class="fieldset">
         <ul id="vo_capabilities-sortable" class="sortable"></ul>
@@ -14,7 +13,19 @@
             <button id="vo_capabilities-reset" class="sortable-reset"></button>
         </div>
     </div>
+</div>
 
+<div class="comments">
+    <div class="fieldset-legend">Comments:</div>
+    <div class="fieldset">
+        <ul id="vo_comments-sortable" class="sortable"></ul>
+        <div class="footer">
+            <button id="vo_comments-add" class="sortable-add"></button>
+            <img id="vo_comments-trash" class="sortable-trash">
+            <span class="spacer"></span>
+            <button id="vo_comments-reset" class="sortable-reset"></button>
+        </div>
+    </div>
 </div>
 
 </div>
diff --git a/vasl_templates/webapp/templates/vo-notes-report.html b/vasl_templates/webapp/templates/vo-notes-report.html
index a428bbc..ff1e8a3 100644
--- a/vasl_templates/webapp/templates/vo-notes-report.html
+++ b/vasl_templates/webapp/templates/vo-notes-report.html
@@ -68,6 +68,12 @@ $(document).ready( function () {
 
 function load_vo_notes( vo_notes, vo_entries )
 {
+    var $results = $("#results") ;
+    if ( !vo_notes && !vo_entries ) {
+        $results.html( "No results." ).show() ;
+        return ;
+    }
+
     // initialize
     var vo_type2 = (vo_type === "vehicles" ? "vehicle" : vo_type ) ;
     var header = nat[0].toUpperCase() + nat.substring(1) + " " + vo_type2[0].toUpperCase() + vo_type2.substring(1) + " Notes" ;
@@ -94,6 +100,26 @@ function load_vo_notes( vo_notes, vo_entries )
                 return +1 ;
             else if ( rhs === "multi-applicable" )
                 return -1 ;
+            // check if we have keys from an extension module (these always sort larger)
+            var lhsPos = lhs.indexOf( ":" ) ;
+            var rhsPos = rhs.indexOf( ":" ) ;
+            if ( lhsPos === -1 && rhsPos !== -1 )
+                return -1 ;
+            else if ( lhsPos !== -1 && rhsPos === -1 )
+                return +1 ;
+            else if ( lhsPos !== -1 && rhsPos !== -1 ) {
+                // both keys are from an extensions module, compare the extension ID's
+                var lhsExtnId = lhs.substring( 0, lhsPos ) ;
+                var rhsExtnId = rhs.substring( 0, rhsPos ) ;
+                if ( lhsExtnId < rhsExtnId )
+                    return -1 ;
+                else if (  lhsExtnId > rhsExtnId )
+                    return +1 ;
+                // both keys are from the same extension module, remove the extension ID and sort normally
+                lhs = lhs.substring( lhsPos+1 ) ;
+                rhs = rhs.substring( rhsPos+1 ) ;
+            }
+            // compare the two keys
             var lhs = parse_key( lhs ) ;
             var rhs = parse_key( rhs ) ;
             if ( lhs[0] < rhs[0] )
@@ -160,7 +186,6 @@ function load_vo_notes( vo_notes, vo_entries )
     }
     buf.push( "</table>" ) ;
 
-    var $results = $("#results") ;
     $results.html( buf.join("") ).show() ;
 }
 
diff --git a/vasl_templates/webapp/templates/vo-report.html b/vasl_templates/webapp/templates/vo-report.html
index c2d39f2..77af3d7 100644
--- a/vasl_templates/webapp/templates/vo-report.html
+++ b/vasl_templates/webapp/templates/vo-report.html
@@ -60,8 +60,7 @@ function load_vo_listings( objs )
     // load the vehicles/ordnance
     var buf = [] ;
     buf.push( "<table>" ) ;
-    buf.push( "<tr>", "<th>Name" ) ;
-    buf.push( "<th colspan='2'>Capabilities", "<th colspan='2'>Notes" ) ;
+    buf.push( "<tr>", "<th>Name", "<th colspan='2'>Capabilities", "<th colspan='2'>Notes", "<th>Comments" ) ;
     for ( var i=0 ; i < objs[nat].length ; ++i ) {
         var obj = objs[nat][i] ;
         if ( vo_name && obj.name.toLowerCase() != vo_name )
@@ -74,6 +73,7 @@ function load_vo_listings( objs )
         buf.push( "<td>", listval(capabilities) ) ;
         buf.push( "<td>", "<span class='val'>" + fmtval(obj.note_number) + "</span>" ) ;
         buf.push( "<td>", listval(obj.notes) ) ;
+        buf.push( "<td>", obj.comments ? listval(obj.comments) : "" ) ;
     }
     buf.push( "</table>" ) ;
     $results.html( buf.join("") ).show() ;
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
index 1d59af9..ec2f545 100644
--- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
@@ -2,4 +2,5 @@
 [*] {{ord.name}}: #={{ord.note_number}}{%if ord.notes%}
 - notes:{%for n in ord.notes%} "{{n}}"{%endfor%}{%endif%}{%if ord.capabilities%}
 - capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if ord.raw_capabilities%}
-- raw capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
+- raw capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if ord.comments%}
+- comments:{%for c in ord.comments%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
index cf4be8b..20f035b 100644
--- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
@@ -2,4 +2,5 @@
 [*] {{veh.name}}: #={{veh.note_number}}{%if veh.notes%}
 - notes:{%for n in veh.notes%} "{{n}}"{%endfor%}{%endif%}{%if veh.capabilities%}
 - capabilities:{%for c in veh.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if veh.raw_capabilities%}
-- raw capabilities:{%for c in veh.raw_capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
+- raw capabilities:{%for c in veh.raw_capabilities%} "{{c}}"{%endfor%}{%endif%}{%if veh.comments%}
+- comments:{%for c in veh.comments%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
diff --git a/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json b/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
index 8e1fa06..0e81d8f 100644
--- a/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
+++ b/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
@@ -22,6 +22,10 @@
   "notes": [ "A", "C" ],
   "id": "ge/v:992"
 },
+{ "name": "a commented german vehicle",
+  "comments": [ "a comment", "another comment" ],
+  "id": "ge/v:993"
+},
 { "name": "name only",
   "id": "ge/v:999"
 }
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
index 339d6d7..c904850 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
@@ -1,7 +1,7 @@
 === landing craft ===
 
-Name      Capabilities    (effective)    #    Notes
---------  --------------  -------------  ---  ------------------------------------------------
+Name      Capabilities    (effective)    #    Notes                                             Comments
+--------  --------------  -------------  ---  ------------------------------------------------  ----------
 LCP(L)    DP 2 CS 4       DP 2 CS 4      1†   A†<sup>1</sup> B†<sup>3</sup> C†<sup>2</sup> D
 LCA       DP 3 CS 6       DP 3 CS 6      2†   n/a
 LCVP      DP 3 CS 5       DP 3 CS 5      3†   B†<sup>2</sup> C†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
index 8b8a884..3da9e09 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1940 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
index c5d1157..04dee0c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1941 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
index 51d3989..047c694 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1942 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
index b54ce8f..b16b671 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1943 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
index c41ebe0..542dc27 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1944 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
index a0c3de6..e1ef5cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1945 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
index 4f8d44c..87fbea2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1940 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
index 82efcd9..1385d55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1941 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
index 36ea0f9..72e00d3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1942 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
index c4c21e5..bdc6c23 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1943 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
index 4b82b2b..be1c26b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1944 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
index 6a3eee3..06705be 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1945 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR WP7 5PP OBA†                     1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR WP6 4PP                          2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8 s7        20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8 s7              20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
index 005ccff..1b65923 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1940 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
index 98972fd..6eab7b1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1941 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
index 1c63530..0ec4200 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1942 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
index 86fdb1e..3089441 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1943 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A4                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A4                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
index 5307a6a..70d0571 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1944 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A3                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A3                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
index 00a5119..6271360 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1945 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A3                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A3                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
index 917a835..f103077 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1940 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
index db96264..8676a18 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1941 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
index 871297c..d060ccc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1942 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
index 28d4e54..3f2df78 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1943 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
index c44e3a5..be73b13 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1944 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
index 87e7eb1..0196874 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1945 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
index 8d0a159..0ae60a3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1940 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP s7                         1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU WP7                     2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
index a26223a..6e20f41 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1941 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP s7                         1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU WP7 s8†                 2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
index 8f6cd56..1ae5eec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1942 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
index 192b1b9..1ca385f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1943 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
index b9da5e9..aedfc37 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1944 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU HE8†                    6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
index 4ba2314..6229ea0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1945 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU D7† HE8†                6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
index 7d643ce..80cc592 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1940 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
index 1465bcc..2c39160 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1941 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
index f8f9af2..fba6cb6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1942 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
index a6ed35d..d9908b0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1943 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
index cbf0700..dc536c7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1944 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
index c001d30..5e4705c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1945 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
index 75bf68f..6decc6d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1940 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
index ddd13ce..7720b74 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1941 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
index 6a82512..0ea092a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1942 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
index 9739e06..1340fcd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1943 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
index 8f39d39..9b7378f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1944 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
index 8463378..ff8d7f5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1945 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
new file mode 100644
index 0000000..7095aa6
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1940 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
new file mode 100644
index 0000000..8e34018
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1941 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
new file mode 100644
index 0000000..2aef635
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1942 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
new file mode 100644
index 0000000..5c70d0f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1943 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
new file mode 100644
index 0000000..375da5c
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1944 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
new file mode 100644
index 0000000..694a031
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1945 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
index d12ecd2..b468052 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1940 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
index edf88b3..40d1013 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1941 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
index af37b0e..e6ec25c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1942 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
index ceafe3e..763e134 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1943 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
index ddb830f..9715300 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1944 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
index f36a43f..a01c6d6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1945 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
index bfee8ee..260d530 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1940 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
index 77325be..71a191c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1941 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
index 454d5d7..9b65a27 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1942 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
index b96f71f..361a3b7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1943 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
index e92add0..f3cd9ec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1944 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
index 6b8b1f5..0158eb3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1945 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
index 6d6a84b..64a0610 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1940 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
index 5d63a2d..dfea359 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1941 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
index 21cf4ec..43e099a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1942 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
index 6db63ea..87caf17 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1943 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
index 4d4b45a..d9c9b5b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1944 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
index 8ffe550..46055a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1945 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
index 990c000..7c2d7a2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1940 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU 5PP dm                                                  3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU                                                         10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
index 0e314cb..6e976ca 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1941 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU 5PP dm                                                  3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
index e59020b..65c21f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1942 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU s8† 5PP dm                                              3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
index 1943c80..9b426b1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1943 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
index 78c1dc5..55e2fe4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1944 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT H4 WP6 s8                                                   28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d WP6 s6                                                  29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
index d0a4cec..6d51354 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1945 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d H6† s8                                                  23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT H6† s8                                                      25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT H4 WP6 s8                                                   28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d WP6 s6                                                  29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
index 271ebe1..c1b6635 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1940 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA†                      2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA†                 2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
index 72d3f9d..cd3fa50 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1941 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA†                      2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA†                 2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
index 1476173..2ccc914 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1942 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
index a7c2546..fab1144 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1943 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
index 19a4e01..73727de 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1944 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
index b43aeb3..07ab76b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1945 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
index 8a9c9f6..b32f465 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1940 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU H6[9]†                          6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU                                 8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU s6                              11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU H6[9]†                          6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU                                 8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU s6                              11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU                                 2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
index fe106b2..b61be52 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1941 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU s6                              11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU s6                              11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A5                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
index 2d2ae6f..8df01ff 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1942 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A5 H6[9]†                       6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU A6                              8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A5 s7                           10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU A5 s6                           11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A5 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A5 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A6                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A5 s7                           10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU A5 s6                           11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A5 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
index 46af1e8..e363d5a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1943 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A4 s7                           10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU A4 s6                           11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A4 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A4 s7                           10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU A4 s6                           11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A4 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
index b5ba251..b8dd803 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1944 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU A3 s6                           11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU A3 s6                           11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
index ec4049b..f1743cb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
@@ -1,34 +1,38 @@
 === ordnance/german/1945 ===
 
-Name                 Capabilities                           (effective)                            #    Notes
--------------------  -------------------------------------  -------------------------------------  ---  ----------------
-5cm leGrW            5PP                                    5PP                                    1    N
-8cm GrW 34           NT QSU IR s8                           NT QSU IR s8                           2†   N
-10cm NbW 35          NT QSU s10                             NT QSU s10                             3    O
-12cm GrW 42          NT QSU s8                              NT QSU s8                              4†   n/a
-2.8cm sPzB 41        NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             5†   A† N P
-3.7cm PaK 35/36      NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
-4.2cm lePaK 41       NT QSU uses APCR TK Table†             NT QSU uses APCR TK Table†             7    A† N<sup>T</sup>
-5cm PaK 38           NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
-7.5cm PaK 97/38      NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
-7.62cm PaK 36r       NT QSU A5[2]4[3]3[4] s6                NT QSU A3 s6                           11†  N
-8.8cm PaK 43         T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
-8.8cm PaK 43/41      NT                                     NT                                     13   n/a
-12.8cm K 81/1        NT NM                                  NT NM                                  14   n/a
-7.5cm leIG 18        NT QSU H7                              NT QSU H7                              15   N O
-15cm sIG 33          NT H7 s8                               NT H7 s8                               16   N
-7.5cm LG 40          T QSU H6                               T QSU H6                               17   N<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-7.5cm leFK 16nA      NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
-10.5cm leFH 18       NT H6 s8                               NT H6 s8                               20   N
-s 10cm K 18          NT NM H6 s8                            NT NM H6 s8                            21   N
-15cm sFH 18          NT NM H6 s8                            NT NM H6 s8                            22   N
-15cm K 18            NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
-17cm K 18            NT RFNM no IF AP6                      NT RFNM no IF AP6                      24   N
-2cm FlaK 30          T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
-2cm FlaK 38          T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
+7.62cm PaK 36r            NT QSU A5[2]4[3]3[4] s6                NT QSU A3 s6                           11†  N
+8.8cm PaK 43              T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -1]  12   C†
+8.8cm PaK 43/41           NT                                     NT                                     13   n/a
+12.8cm K 81/1             NT NM                                  NT NM                                  14   n/a
+7.5cm leIG 18             NT QSU H7                              NT QSU H7                              15   N O
+15cm sIG 33               NT H7 s8                               NT H7 s8                               16   N
+7.5cm LG 40               T QSU H6                               T QSU H6                               17   N<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+7.5cm leFK 16nA           NT QSU h-d H5 s8                       NT QSU h-d H5 s8                       19   n/a
+10.5cm leFH 18            NT H6 s8                               NT H6 s8                               20   N
+s 10cm K 18               NT NM H6 s8                            NT NM H6 s8                            21   N
+15cm sFH 18               NT NM H6 s8                            NT NM H6 s8                            22   N
+15cm K 18                 NT RFNM AP6                            NT RFNM AP6                            23   N<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
index af5a02b..e945914 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1940 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
index 9c6cadb..6e803dc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1941 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
index a1a6da8..2d5c59d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1942 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
index 53e4f5b..5c256bc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1943 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
index b9f68f3..a438005 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1944 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
index 51baa18..9a505d4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1945 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
index 9591190..adee1b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1940 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
index 6611a0e..1a11033 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1941 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
index 4aba318..ce0f1e9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1942 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
index 32b1b3c..525e23e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1943 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
index 48848be..90b4245 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1944 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
index 162897f..e13de55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1945 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
new file mode 100644
index 0000000..8f22907
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1940 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
new file mode 100644
index 0000000..82e1e63
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1941 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
new file mode 100644
index 0000000..b79e75a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1942 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
new file mode 100644
index 0000000..9c4bc71
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1943 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
new file mode 100644
index 0000000..fb75e3b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1944 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
new file mode 100644
index 0000000..7bcf98d
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1945 ===
+
+Name                               Capabilities                (effective)                #  Notes    Comments
+---------------------------------  --------------------------  -----------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            S6 WP5 4PP                 1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP       2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)               3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d                 4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                     5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  WP5 NT QSU h-d AP TK#12    6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
index 0a90a80..1975351 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1940 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield                  5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU                 5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
index 61e65f3..985044b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1941 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield                  5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU                 5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
index 7f52841..5562887 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1942 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
index fefe8fe..f17a45b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1943 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
index 95d0f09..19c3a55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1944 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
index d45039d..3a9dcae 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1945 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
index 7704873..935d48e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1940 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
index d5505d1..2f754cf 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1941 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
index ce3be74..f566aba 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1942 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
index bf2e6cd..3422aee 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1943 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
index e4012d3..d99d166 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1944 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d H6† WP7           11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d H6† WP7                          11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP LF [75, 1 ROF, B11]                    4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
index 1bc1ec6..6755216 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1945 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 H6 WP5        10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d H6† WP7           11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 H6 WP5                       10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d H6† WP7                          11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP LF [75, 1 ROF, B11]                    4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
index e1fb527..141e94f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1940 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
index 219826b..c1b886c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1941 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
index 03e3bc0..c4298f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1942 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
index 57204e6..8782474 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1943 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
index 53271ce..9398f03 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1944 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
index 4504efa..2ddca42 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1945 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
index 6787c6a..0953265 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1940 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
index 5155ead..49adb68 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1941 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
index c0ee3fc..d1f7c9d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1942 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
index 160ee7d..ea97ce6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1943 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
index b155669..f975bf1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1944 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
index 6b6a6c6..01c5cae 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1945 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
index 44a76c5..64f5323 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1940 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU s8                     15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU s8                     16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU s8         15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU s8         16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
index 404e2b9..d53349d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1941 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU s8                     15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU s8                     16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU s8         15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU s8         16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
index 0a263bf..ab608db 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1942 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A4                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A4                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A4 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A4         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A4         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A4 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
index cd0b6c0..300e4fc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1943 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A5                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A5                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A4                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A5 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A5         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A5         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A4         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A5 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
index a15eda7..92dfd28 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1944 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A6                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A6                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A5                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A6 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU A5 s8                  17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A6         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A6         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A5         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A6 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU A5 s8      17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
index fd5d0c6..3c95596 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1945 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A7                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A7                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A6                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A7 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU A6 s8                  17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A7         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A7         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A6         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A7 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU A6 s8      17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
index 7db49ad..3a6eb36 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1940 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU                29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU         29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
index 32c9d10..02c9d11 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1941 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A5             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A5      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
index 012a0b8..fe69724 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1942 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
index a0a487e..33b9070 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1943 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
index 58a76e8..614744c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1944 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
index 81f59c1..706bbd9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1945 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
new file mode 100644
index 0000000..ec631a7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1940 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
new file mode 100644
index 0000000..c0f1920
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1941 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
new file mode 100644
index 0000000..4e04e2f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1942 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
new file mode 100644
index 0000000..1e8c399
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1943 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
new file mode 100644
index 0000000..dc313d7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1944 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
new file mode 100644
index 0000000..ebba131
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1945 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
index f769208..b312554 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1940 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
index a83d114..e3a4a01 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1941 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
index 3b37f33..8d3341d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1942 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
index 08bd848..71bc55c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1943 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
index 666dca4..b9fd8b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1944 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
index 816f2c4..c24ed53 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1945 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
index af7ca12..4b684d7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1940 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
index 4f0975f..8eb12b2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1941 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
index c7f8b71..5336680 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1942 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
index 3f94260..c487184 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1943 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
index cd88fa6..4b6f6d1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1944 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
index a1393bb..c5c1e91 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1945 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
index 1052656..af067fc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1940 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
index bdfa2e1..329a900 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1941 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
index b9d5546..be813c6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1942 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
index 5818070..8844248 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1943 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4              2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
index 46a73c7..75fe7bb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1944 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4              2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  sM4 CS 5[brewup]         12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     C4†[1] H9 WP9 CS 5       43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  sM4 CS 5[brewup]         12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
index f65ae2b..d22cab9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/american/1945 ===
 
-Name                 Capabilities                               (effective)                  #       Notes
--------------------  -----------------------------------------  ---------------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)                  #       Notes                                                                      Comments
+-------------------  -----------------------------------------  ---------------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                         1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4                  2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4                  3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                         56†     N
 2&#189;-Ton          cs 7                                       cs 7                         57†     N
 7&#189;-Ton          cs 7                                       cs 7                         58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                         1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                         2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                         3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                         4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                         5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6                  6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                         7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                         8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5              9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6              10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                         11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4                  5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  WP7†[3] s5 sM4 CS 5[brewup]  12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6              13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6           17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6           17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            A6†[1] s5 sP5 CS 7           23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     C4†[1] H9 WP9 CS 5           43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4                  5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  WP7†[3] s5 sM4 CS 5[brewup]  12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6              13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt
new file mode 100644
index 0000000..2d0fe87
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1940 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt
new file mode 100644
index 0000000..239967d
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1941 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt
new file mode 100644
index 0000000..96d7811
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1942 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt
new file mode 100644
index 0000000..a3a4934
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1943 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt
new file mode 100644
index 0000000..59c2184
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1944 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt
new file mode 100644
index 0000000..817b9dc
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1945 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
index 21af8fa..0b42873 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1940 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
index 7ef93de..adf7ad8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1941 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
index 2dcbc1d..06a824e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1942 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
index 4713e33..1ac8c7c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1943 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
index 899235e..c8b09c8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1944 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
index 72706b0..0dd5fa3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1945 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
index c26380d..e6ec425 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1940 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
index 288637a..e841bd8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1941 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
index 91dd774..7049012 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1942 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
index 4f032ad..91f5305 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1943 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
index 43171cd..3ff3291 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1944 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
index 048afe0..8b814df 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1945 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
index 4e83d29..e4ea7d2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1940 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
index 96d6d0f..5208476 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1941 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
index 8982459..33bf2d8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1942 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
index b3cae01..88f8649 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1943 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
index a7f9387..b392f7e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1944 ===
 
-Name                       Capabilities                                          (effective)                       #       Notes
--------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                       #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                          1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                          1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                          2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
index c32e1a6..ec9a5d2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/british/1945 ===
 
-Name                       Capabilities                                          (effective)                       #       Notes
--------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                       #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                          1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                          1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                          2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
index bbb4938..f6a6867 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1940 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
index 8890e30..74348d9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1941 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
index 98de2a2..822b5af 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1942 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
index 7b17f74..59f8ed4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1943 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
index d02b35d..9c54b3a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1944 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
index d4089d1..1d1f350 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1945 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
index 7daf16a..32e6e7b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1940 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
index 6bdc4a5..12960bf 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1941 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
index 88296ed..0de84ab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1942 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
index 399ce02..2f31ef9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1943 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
index c5adb2f..badffab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1944 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
index 587ba90..1268a08 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1945 ===
 
-Name                   Capabilities               (effective)           #       Notes
----------------------  -------------------------  --------------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2                1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3                  5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4                  8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2                  11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3                12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3                  14†     A
-Carrier B(b)           CS 3                       CS 3                  14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3                  14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7                  15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7                  16†     A
+Name                           Capabilities               (effective)           #       Notes                                     Comments
+-----------------------------  -------------------------  --------------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2                1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3                  5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4                  8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2                  11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3                12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3                  14†     A
+Carrier B(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7                  15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7                  16†     A
+FT-17(f)                       ® CS 2                     ® CS 2                1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2                2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2                3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2                4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3                5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3                6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4                7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4                8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3                9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt
new file mode 100644
index 0000000..513e12b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1940 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt
new file mode 100644
index 0000000..5cc8928
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1941 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt
new file mode 100644
index 0000000..86a96d5
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1942 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt
new file mode 100644
index 0000000..858861b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1943 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt
new file mode 100644
index 0000000..a686d30
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1944 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt
new file mode 100644
index 0000000..c8e8ae7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1945 ===
+
+Name                           Capabilities               (effective)           #       Notes                                     Comments
+-----------------------------  -------------------------  --------------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2                1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3                  5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4                  8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2                  11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3                12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3                  14†     A
+Carrier B(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7                  15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7                  16†     A
+FT-17(f)                       ® CS 2                     ® CS 2                1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2                2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2                3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2                4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3                5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3                6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4                7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4                8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3                9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
index fa4b355..91ed9cc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1940 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
index 7b6f242..b2d687b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1941 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
index 4c56243..5f4411c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1942 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
index 021b0a7..287af90 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1943 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
index 355800f..ea38114 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1944 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
index d1f8d99..dcea9a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1945 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
index b9ee24c..d86a8a1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1940 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
index 5e4dfe4..9ea5888 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1941 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
index 100381a..58f4088 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1942 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
index d7566e6..f54669e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1943 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
index 57440ac..ff9d13f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1944 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
index d3d76db..438f033 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1945 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
index 4f5c50b..1ae8e32 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1940 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
index f8fbd05..4b3a859 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1941 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
index f424309..e787ac1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1942 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
index b4d4258..eb90f47 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1943 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
index 82aa065..1154299 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1944 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
index b0c1769..89c39c3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1945 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
index 9ccbfd3..bcca042 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1940 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
index 13c17e3..a8a7ab4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1941 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
index f369cb2..d8d817a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1942 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
index b5b39d5..b9f14ab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1943 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
index 8e8be0b..627e5b7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1944 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
index bfddaeb..db60467 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1945 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
index dc9e0a2..10b5b2c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1940 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
index 013088e..d99155c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1941 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
index 6e7e055..f3e74a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1942 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
index ef2201d..5377dce 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1943 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
index bc51005..2d56a48 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1944 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
index 41bcbf4..0e86576 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1945 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
index 8be3eeb..9ecf1a1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1940 ===
 
-Name                    Capabilities                   (effective)               #      Notes
-----------------------  -----------------------------  ------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             sD6 CS 4                  7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             sD7 CS 4                  8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                      9      A† E
-FT-17 730m(f)           CS 2                           CS 2                      9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                      9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 sD7 CS 5                  11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 sD7 CS 5                  12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 sD7 CS 6                  13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                      27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                      28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†  K
-PzJg Tiger              CS 7                           CS 7                      38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42     I P†
-PzJg I                  A5[1] HE7 CS 3                 HE7 CS 3                  43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 HE7 CS 3                  44     a
-Pz 35R 731(f)           CS 2                           CS 2                      44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                      51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56     n/a
-SPW 250/1               CS 4                           CS 4                      57     N
-SPW 250/sMG             CS 4†                          CS 4†                     58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60     Q†
-SPW 250/9               CS 4                           CS 4                      61†    A†
-SPW 250/10              A4[1] CS 4                     CS 4                      62     J† N
-SPW 251/1               CS 5                           CS 5                      63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                     58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64     C† N Q†
-SPW 251/10              A4[1] CS 4                     CS 4                      65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†    n/a
-SPW 251/21              CS 4                           CS 4                      66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2   a e
-Kfz 13                  CS 2                           CS 2                      68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                  69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                  70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                      71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                      74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                      84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                      85†    A†
-(Moebelwagen)           CS 6                           CS 6                      85†    A†
-FlaKPz IV/20            CS 6                           CS 6                      86     A†
-FlaKPz IV/37            CS 6                           CS 6                      87     A†
-SdKfz 10/4              CS 5                           CS 5                      88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                      88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                      89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                      90     A† D† N
-Kfz 4                   CS 3                           CS 3                      91†    N
-2cm FlaK LKW            CS 5                           CS 5                      92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                      92     A†
-Goliath                                                                          93†    L†
-Kfz 1                   cs 2†                          cs 2†                     94†    L† N
-Kfz 1/20                cs 2                           cs 2                      95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                      96     N
-Buessing-NAG 4500       cs 7                           cs 7                      96     N
-SdKfz 2                 cs 2                           cs 2                      97†    L† N
-SdKfz 7                 cs 6                           cs 6                      98     N
-SdKfz 11                cs 5                           cs 5                      99     N
+Name                    Capabilities                   (effective)               #       Notes                              Comments
+----------------------  -----------------------------  ------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             sD6 CS 4                  7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             sD7 CS 4                  8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                      9       A† E
+FT-17 730m(f)           CS 2                           CS 2                      9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                      9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 sD7 CS 5                  11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 sD7 CS 5                  12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 sD7 CS 6                  13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                      27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                      28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†   K
+PzJg Tiger              CS 7                           CS 7                      38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42      I P†
+PzJg I                  A5[1] HE7 CS 3                 HE7 CS 3                  43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 HE7 CS 3                  44      a
+Pz 35R 731(f)           CS 2                           CS 2                      44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                      51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56      n/a
+SPW 250/1               CS 4                           CS 4                      57      N
+SPW 250/sMG             CS 4†                          CS 4†                     58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60      Q†
+SPW 250/9               CS 4                           CS 4                      61†     A†
+SPW 250/10              A4[1] CS 4                     CS 4                      62      J† N
+SPW 251/1               CS 5                           CS 5                      63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                     58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64      C† N Q†
+SPW 251/10              A4[1] CS 4                     CS 4                      65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†     n/a
+SPW 251/21              CS 4                           CS 4                      66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2    a e
+Kfz 13                  CS 2                           CS 2                      68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                  69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                  70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                      71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                      74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                      84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                      85†     A†
+(Moebelwagen)           CS 6                           CS 6                      85†     A†
+FlaKPz IV/20            CS 6                           CS 6                      86      A†
+FlaKPz IV/37            CS 6                           CS 6                      87      A†
+SdKfz 10/4              CS 5                           CS 5                      88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                      88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                      89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                      90      A† D† N
+Kfz 4                   CS 3                           CS 3                      91†     N
+2cm FlaK LKW            CS 5                           CS 5                      92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                      92      A†
+Goliath                                                                          93†     L†
+Kfz 1                   cs 2†                          cs 2†                     94†     L† N
+Kfz 1/20                cs 2                           cs 2                      95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                      96      N
+Buessing-NAG 4500       cs 7                           cs 7                      96      N
+SdKfz 2                 cs 2                           cs 2                      97†     L† N
+SdKfz 7                 cs 6                           cs 6                      98      N
+SdKfz 11                cs 5                           cs 5                      99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                  1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                  2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                  3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                  4†      n/a
+Pz-7TP                  CS 3                           CS 3                      5       B†
+PSW M35                 CS 5                           CS 5                      6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 CS 6                      7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
index fe56a35..c2d8a94 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1941 ===
 
-Name                    Capabilities                   (effective)               #      Notes
-----------------------  -----------------------------  ------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A4 sD6 CS 4               7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A4 sD7 CS 4               8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                      9      A† E
-FT-17 730m(f)           CS 2                           CS 2                      9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                      9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5               11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5               12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6               13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                      27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                      28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†  K
-PzJg Tiger              CS 7                           CS 7                      38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3               43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3               44     a
-Pz 35R 731(f)           CS 2                           CS 2                      44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                      51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56     n/a
-SPW 250/1               CS 4                           CS 4                      57     N
-SPW 250/sMG             CS 4†                          CS 4†                     58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60     Q†
-SPW 250/9               CS 4                           CS 4                      61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                   62     J† N
-SPW 251/1               CS 5                           CS 5                      63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                     58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                   65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†    n/a
-SPW 251/21              CS 4                           CS 4                      66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2   a e
-Kfz 13                  CS 2                           CS 2                      68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                  69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                  70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                      71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                      74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                      84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                      85†    A†
-(Moebelwagen)           CS 6                           CS 6                      85†    A†
-FlaKPz IV/20            CS 6                           CS 6                      86     A†
-FlaKPz IV/37            CS 6                           CS 6                      87     A†
-SdKfz 10/4              CS 5                           CS 5                      88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                      88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                      89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                      90     A† D† N
-Kfz 4                   CS 3                           CS 3                      91†    N
-2cm FlaK LKW            CS 5                           CS 5                      92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                      92     A†
-Goliath                                                                          93†    L†
-Kfz 1                   cs 2†                          cs 2†                     94†    L† N
-Kfz 1/20                cs 2                           cs 2                      95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                      96     N
-Buessing-NAG 4500       cs 7                           cs 7                      96     N
-SdKfz 2                 cs 2                           cs 2                      97†    L† N
-SdKfz 7                 cs 6                           cs 6                      98     N
-SdKfz 11                cs 5                           cs 5                      99     N
+Name                    Capabilities                   (effective)               #       Notes                              Comments
+----------------------  -----------------------------  ------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A4 sD6 CS 4               7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A4 sD7 CS 4               8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                      9       A† E
+FT-17 730m(f)           CS 2                           CS 2                      9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                      9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5               11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5               12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6               13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                      27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                      28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†   K
+PzJg Tiger              CS 7                           CS 7                      38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3               43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3               44      a
+Pz 35R 731(f)           CS 2                           CS 2                      44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                      51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56      n/a
+SPW 250/1               CS 4                           CS 4                      57      N
+SPW 250/sMG             CS 4†                          CS 4†                     58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60      Q†
+SPW 250/9               CS 4                           CS 4                      61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                   62      J† N
+SPW 251/1               CS 5                           CS 5                      63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                     58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                   65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†     n/a
+SPW 251/21              CS 4                           CS 4                      66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2    a e
+Kfz 13                  CS 2                           CS 2                      68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                  69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                  70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                      71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                      74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                      84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                      85†     A†
+(Moebelwagen)           CS 6                           CS 6                      85†     A†
+FlaKPz IV/20            CS 6                           CS 6                      86      A†
+FlaKPz IV/37            CS 6                           CS 6                      87      A†
+SdKfz 10/4              CS 5                           CS 5                      88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                      88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                      89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                      90      A† D† N
+Kfz 4                   CS 3                           CS 3                      91†     N
+2cm FlaK LKW            CS 5                           CS 5                      92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                      92      A†
+Goliath                                                                          93†     L†
+Kfz 1                   cs 2†                          cs 2†                     94†     L† N
+Kfz 1/20                cs 2                           cs 2                      95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                      96      N
+Buessing-NAG 4500       cs 7                           cs 7                      96      N
+SdKfz 2                 cs 2                           cs 2                      97†     L† N
+SdKfz 7                 cs 6                           cs 6                      98      N
+SdKfz 11                cs 5                           cs 5                      99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                  1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                  2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                  3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                  4†      n/a
+Pz-7TP                  CS 3                           CS 3                      5       B†
+PSW M35                 CS 5                           CS 5                      6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 CS 6                      7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
index 27c02d6..6777d8e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1942 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                        27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]     48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                    75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                        27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]     48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                    75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A5 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
index 6d9a996..f151928 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1943 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                        27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                        27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
index 10ed25e..7fb7cd0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1944 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
index 576144b..74b92cc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
@@ -1,124 +1,131 @@
 === vehicles/german/1945 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
index 84b5343..ed171b2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1940 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
index 94411f2..bffaeab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1941 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
index 7a0279f..00fd702 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1942 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
index d2999c3..66b24ec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1943 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
index 0c5bdbe..7162a95 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1944 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
index 0a977a2..976bf42 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1945 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
index 131ac80..2ade5ed 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1940 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
index a09dfa7..c1bfe82 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1941 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
index 64e0022..8fb4d50 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1942 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
index 2eb012c..cfc9246 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1943 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
index 5c8bb10..850c3f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1944 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
index 9467f80..5f019da 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1945 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt
new file mode 100644
index 0000000..698e063
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1940 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt
new file mode 100644
index 0000000..361141a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1941 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt
new file mode 100644
index 0000000..46d003f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1942 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt
new file mode 100644
index 0000000..afaade9
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1943 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt
new file mode 100644
index 0000000..97f390e
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1944 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt
new file mode 100644
index 0000000..a7cdbd8
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1945 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
index 1ca9e04..67ae6c1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1940 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
index 121a31c..6d38592 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1941 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
index 3f90f26..f6a8b62 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1942 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
index 1c7dcbe..618affc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1943 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
index d77cb2a..46d45d8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1944 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
index 19b3154..7a1840c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/italian/1945 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
index 23d1ca3..b46cbab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1940 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
index cc32409..ec9bce3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1941 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
index 2771f65..b4177cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1942 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
index 168c6fb..0043aa8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1943 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
index fdd9f14..2c799da 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1944 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
index 364efc0..19eb8d0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1945 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
index 5639ee6..feea5fe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1940 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
index 136caf4..c1d9f95 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1941 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
index d6cbc9d..0a2c669 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1942 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
index 27a2801..f4c71bc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1943 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
index 9e5338d..1f0631f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1944 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
index 9e20a34..ffa0eb8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1945 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
index 26abfa1..246046f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1940 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
index 906f8d7..9c9c2f3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1941 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
index d00e296..c9e2835 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1942 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
index 6d1be7e..2184c89 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1943 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
index dd18194..085c876 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1944 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
index a20f060..6381805 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1945 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
index 306d119..4df26b8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1940 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® CS 4                   3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† CS 2                  5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†    C† M
-T-34 M43           A4[2] CS 5                                   CS 5                     16†    n/a
-T-43               ®† A4[2] CS 5                                ®† CS 5                  17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   CS 6                     23     D M
-KV-1 M42           A4[2] CS 6                                   CS 6                     23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†    D M
-KV-1S              A4[2] CS 6                                   CS 6                     25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® CS 4                   39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® CS 4                   3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† CS 2                  5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†     C† M
+T-34 M43           A4[2] CS 5                                   CS 5                     16†     n/a
+T-43               ®† A4[2] CS 5                                ®† CS 5                  17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   CS 6                     23      D M
+KV-1 M42           A4[2] CS 6                                   CS 6                     23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†     D M
+KV-1S              A4[2] CS 6                                   CS 6                     25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® CS 4                   39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® C4† CS 4               17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
index d544556..31a21a9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1941 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® CS 4                   3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† CS 2                  5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†    C† M
-T-34 M43           A4[2] CS 5                                   CS 5                     16†    n/a
-T-43               ®† A4[2] CS 5                                ®† CS 5                  17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   CS 6                     23     D M
-KV-1 M42           A4[2] CS 6                                   CS 6                     23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†    D M
-KV-1S              A4[2] CS 6                                   CS 6                     25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® CS 4                   39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® CS 4                   3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† CS 2                  5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†     C† M
+T-34 M43           A4[2] CS 5                                   CS 5                     16†     n/a
+T-43               ®† A4[2] CS 5                                ®† CS 5                  17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   CS 6                     23      D M
+KV-1 M42           A4[2] CS 6                                   CS 6                     23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†     D M
+KV-1S              A4[2] CS 6                                   CS 6                     25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® CS 4                   39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® C4† CS 4               17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
index 40d4b66..d645e94 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1942 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A4 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
index 07397fa..8d0b056 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1943 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A4 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A4 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
index aa96272..a98d2f8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1944 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  HE8† sD6 sM8† CS 7       53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  HE8† sD6 sM8† CS 7       53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
index f2d5fe1..0e698f7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1945 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†    N
-T-44               A6[5] CS 5                                   A6 CS 5                  20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    WP6† s8 CS 5[brewup]     50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  D7† HE8† sD6 sM8† CS 7   53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†     N
+T-44               A6[5] CS 5                                   A6 CS 5                  20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    WP6† s8 CS 5[brewup]     50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  D7† HE8† sD6 sM8† CS 7   53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
index aa71e29..04c3bd8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1940 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
index 71514a2..33c270e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1941 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
index 2ea45ca..14fe081 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1942 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
index ec96104..1d1c69a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1943 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
index 0dc3199..dcc6442 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1944 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
index 6fa2c09..fe12383 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1945 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt
new file mode 100644
index 0000000..68286cb
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1940 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt
new file mode 100644
index 0000000..f5229e7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1941 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt
new file mode 100644
index 0000000..1fac15a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1942 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt
new file mode 100644
index 0000000..177cc74
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1943 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt
new file mode 100644
index 0000000..4c43c0a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1944 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt
new file mode 100644
index 0000000..b46478f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1945 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
index 1b168fd..a17fa65 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1940 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
index 72a41ba..fe38e90 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1941 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
index ade715c..8c6b085 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1942 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
index b5d1755..20c708e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1943 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
index 3ad9812..45f9583 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1944 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
index 07a9476..385da00 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1945 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/test_capabilities.py b/vasl_templates/webapp/tests/test_capabilities.py
index 5a8f383..d60f23c 100644
--- a/vasl_templates/webapp/tests/test_capabilities.py
+++ b/vasl_templates/webapp/tests/test_capabilities.py
@@ -252,10 +252,10 @@ def test_month_capabilities( webapp, webdriver ):
 
     # Cannone da 47/32: Towed(A1+)†
     ordnance = [ "italian", "ordnance", "Cannone da 47/32" ]
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "12/1940", "NT QSU no Gunshield" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "07/1941", "NT QSU no Gunshield" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "08/1941", "NT QSU no Gunshield Towed[!]" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1942", "NT QSU no Gunshield Towed[!]" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "12/1940", "NT QSU" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "07/1941", "NT QSU" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "08/1941", "NT QSU Towed[!]" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1942", "NT QSU Towed[!]" )
 
     # Cannone da 65/17, 75/27, 75/32 + Obice da 75/18: H6(S2+)†1
     for vo_name in ("Cannone da 65/17", "Cannone da 75/27","Cannone da 75/32","Obice da 75/18"):
@@ -387,6 +387,39 @@ def test_theater_capabilities( webapp, webdriver ):
     _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1940", "NT h-d<sup>C</sup>[!] s5" )
     _check_capabilities( webdriver, webapp, *ordnance, "Burma", "01/1940", "NT h-d<sup>C</sup>[!] WP6[!] s5" )
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+@pytest.mark.skipif(
+    pytest.config.option.short_tests, #pylint: disable=no-member
+    reason = "--short-tests specified"
+)
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_theater_capabilities_bfp( webapp, webdriver ):
+    """Test theater-specific capabilities (BFP extension)."""
+
+    # initialize
+    init_webapp( webapp, webdriver,
+        reset = lambda ct: ct.set_vasl_mod( vmod="random", extns_dtype="real" )
+    )
+
+    # LVT(A)1(L): C10(P)†2
+    vehicle = [ "american", "vehicles", "LVT(A)1(L)" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "CS 6" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C10[!2] CS 6" )
+
+    # LVT(A)4(L): C7(P)†3
+    vehicle = [ "american", "vehicles", "LVT(A)4(L)" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "H8 WP9 CS 6" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C7[!3] H8 WP9 CS 6" )
+
+    # M3A1F: C7(P)†
+    vehicle = [ "american", "vehicles", "M3A1F" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "CS 4" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C7[!] CS 4" )
+
 # ---------------------------------------------------------------------
 
 @pytest.mark.skipif(
@@ -548,6 +581,128 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     assert len(saved_scenario["OB_VEHICLES_1"]) == 1
     assert "custom_capabilities" not in saved_scenario["OB_VEHICLES_1"][0]
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-statements
+    """Test custom comments."""
+
+    # NOTE: Vehicle/ordnance comments are not capabilities, but they are managed in the same place
+    # and the code is virtually identical, so it makes sense to put the test code here.
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1 )
+
+    # add a vehicle
+    add_vo( webdriver, "vehicles", 1, "a commented german vehicle" )
+
+    snippet_btn = find_child( "button[data-id='ob_vehicles_1']" )
+    def extract_comments( clipboard ):
+        """Extract the comments."""
+        mo = re.search( r"^- comments: (.*)$", clipboard, re.MULTILINE )
+        return mo.group(1) if mo else ""
+    def check_snippet( expected ):
+        """Check the vehicle's snippet."""
+        snippet_btn.click()
+        wait_for_clipboard( 2, expected, transform=extract_comments )
+    def check_comments_in_dialog( expected ):
+        """Check the vehicle's comments."""
+        elems = find_children( "#vo_comments-sortable li" )
+        elems2 = [ find_child("input[type='text']",c) for c in elems ]
+        assert [ e.get_attribute("value") for e in elems2 ] == expected
+        return elems
+
+    # check the vehicle's snippet
+    check_snippet( '"a comment" "another comment"' )
+
+    # edit the vehicle's comments
+    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = check_comments_in_dialog( [ "a comment", "another comment" ] )
+
+    # edit one of the comments
+    elem = find_child( "input[type='text']", elems[0] )
+    elem.clear()
+    elem.send_keys( "a comment (modified)" )
+
+    # delete a comment
+    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+
+    # add a new comment
+    elem = find_child( "#vo_comments-add" )
+    elem.click()
+    elems = find_children( "#vo_comments-sortable input[type='text']" )
+    assert len(elems) == 2
+    elems[1].send_keys( "a <i>new</i> comment" )
+
+    # save the changes and check the vehicle's snippet
+    click_dialog_button( "OK" )
+    check_snippet( '"a comment (modified)" "a <i>new</i> comment"' )
+
+    # save the scenario
+    saved_scenario = save_scenario()
+    assert len(saved_scenario["OB_VEHICLES_1"]) == 1
+    assert saved_scenario["OB_VEHICLES_1"][0]["custom_comments"] == [ "a comment (modified)", "a <i>new</i> comment" ]
+
+    # reload the scenario, and check the vehicle's snippet
+    select_menu_option( "new_scenario" )
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    check_snippet( '"a comment (modified)" "a <i>new</i> comment"' )
+
+    # make sure the comments are loaded correcly when editing the vehicle
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = check_comments_in_dialog( [ "a comment (modified)", "a <i>new</i> comment" ] )
+
+    # delete all comments
+    for elem in elems:
+        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+    click_dialog_button( "OK" )
+    check_snippet( "" )
+
+    # save the scenario
+    saved_scenario2 = save_scenario()
+    assert len(saved_scenario2["OB_VEHICLES_1"]) == 1
+    assert saved_scenario2["OB_VEHICLES_1"][0]["custom_comments"] == []
+
+    # reload the scenario, and reset the vehicle's comments back to the default
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    btn = find_child( "#vo_comments-reset" )
+    btn.click()
+    click_dialog_button( "OK" )
+    check_snippet( '"a comment" "another comment"' )
+
+    # make sure the custom comments are no longer saved in the scenario
+    saved_scenario2 = save_scenario()
+    assert len(saved_scenario2["OB_VEHICLES_1"]) == 1
+    assert "custom_comments" not in saved_scenario2["OB_VEHICLES_1"][0]
+
+    # reload the scenario, and manually set the vehicle's comments to be the same as the default
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = find_children( "#vo_comments-sortable input[type='text']" )
+    assert len(elems) == 2
+    elems[0].clear()
+    elems[0].send_keys( "a comment" )
+    elems[1].clear()
+    elems[1].send_keys( "another comment" )
+    click_dialog_button( "OK" )
+
+    # make sure the custom comments are no longer saved in the scenario
+    saved_scenario = save_scenario()
+    assert len(saved_scenario["OB_VEHICLES_1"]) == 1
+    assert "custom_comments" not in saved_scenario["OB_VEHICLES_1"][0]
+
 # ---------------------------------------------------------------------
 
 @pytest.mark.skipif(
diff --git a/vasl_templates/webapp/tests/test_vasl_extensions.py b/vasl_templates/webapp/tests/test_vasl_extensions.py
index 2f24aea..6b7731c 100644
--- a/vasl_templates/webapp/tests/test_vasl_extensions.py
+++ b/vasl_templates/webapp/tests/test_vasl_extensions.py
@@ -3,13 +3,16 @@
 import os
 import zipfile
 import typing
+import re
 
 import pytest
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
 
 from vasl_templates.webapp.utils import TempFile
-from vasl_templates.webapp.tests.utils import init_webapp, set_player, find_child, find_children
+from vasl_templates.webapp.tests.utils import init_webapp, set_player, select_tab, \
+    find_child, find_children, wait_for_clipboard
+from vasl_templates.webapp.tests.test_scenario_persistence import load_scenario
 from vasl_templates.webapp.tests.test_vehicles_ordnance import add_vo
 
 # ---------------------------------------------------------------------
@@ -160,6 +163,141 @@ def test_kgs_extensions( webapp, webdriver ):
 
 # ---------------------------------------------------------------------
 
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_bfp_extensions( webapp, webdriver ):
+    """Test the Bounding Fire extension."""
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
+              .set_vo_notes_dir( dtype="real" )
+    )
+
+    # load the test scenario
+    load_scenario( {
+        "PLAYER_1": "japanese",
+        "OB_VEHICLES_1": [
+            { "name": "Type 97A CHI-HA" }, # nb: this is a normal counter
+            { "name": "M3A1 Scout Car(a)" } # nb: this is a BFP counter
+        ],
+    } )
+    select_tab( "ob1" )
+
+    # test the OB snippet
+    btn = find_child( "button.generate[data-id='ob_vehicles_1']" )
+    btn.click()
+    wait_for_clipboard( 2, re.compile(
+        'Type 97A CHI-HA'
+        '.+<div class="note">'
+        '.+8\u2020, B\u2020<sup>1</sup>, C\u2020<sup>2</sup>'
+        '.+</div>'
+        r'.+M3A1 Scout Car\(a\)'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+17, A, C, AllM 34\u2020<sup>2</sup>, Jp A\u2020<sup>1</sup>, Ch F\u2020'
+        '.+</div>',
+        re.DOTALL
+    ) )
+
+    # test the multi-applicable notes
+    btn = find_child( "button.generate[data-id='ob_vehicles_ma_notes_1']" )
+    btn.click()
+    wait_for_clipboard( 2, [
+        ( False, "B", "sD becomes available" ),
+        ( False, "C", "This tank has no rad" ),
+        ( True, "A", "The (a) indicates U." ),
+        ( True, "C", "Although a captured " ),
+        ( True, "Ch F", "This vehicle, despit" ),
+        ( True, "Jp A", "The MA <i>and all</i" ),
+    ], transform=_extract_extn_ma_notes )
+
+    # test the Chapter H note
+    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "li img.snippet", vehicles_sortable )
+    assert len(elems) == 2
+    elems[0].click()
+    wait_for_clipboard( 2, re.compile( r'<img src=".*?/vehicles/japanese/note/8">' ) )
+    elems[1].click()
+    wait_for_clipboard( 2, re.compile( r'<img src=".*?/vehicles/japanese/note/adf:17">' ) )
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_bfp_extensions2( webapp, webdriver ):
+    """Test the Bounding Fire extension (Operation Cobra counters)."""
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
+              .set_vo_notes_dir( dtype="real" )
+    )
+
+    # load the test scenario
+    load_scenario( {
+        "PLAYER_1": "american",
+        "OB_VEHICLES_1": [
+            { "name": "M5A1" }, # nb: this is a normal counter
+            { "name": "M5A1F" }, # nb: this is the flamethrower version
+            { "name": "M5A1C" }, # nb: this is the Culin version
+        ],
+    } )
+    select_tab( "ob1" )
+
+    # test the OB snippet
+    btn = find_child( "button.generate[data-id='ob_vehicles_1']" )
+    btn.click()
+    wait_for_clipboard( 2, re.compile(
+        r'\bM5A1\b'
+        '.+<div class="note">'
+        '.+5\u2020, C\u2020<sup>2</sup>, F\u2020<sup>1</sup>, G, N, Y'
+        '.+</div>'
+        r'.+\bM5A1F\b'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+5\u2020, US C\u2020<sup>2</sup>, US F\u2020<sup>1</sup>, US G, US N, US Y, C'
+        '.+</div>'
+        r'.+\bM5A1C\b'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+5\u2020, US C\u2020<sup>2</sup>, US F\u2020<sup>1</sup>, US G, US N, US Y, A, B'
+        '.+</div>',
+        re.DOTALL
+    ) )
+
+    # test the multi-applicable notes
+    btn = find_child( "button.generate[data-id='ob_vehicles_ma_notes_1']" )
+    btn.click()
+    wait_for_clipboard( 2, [
+        ( False, "C", "37mm canister has 12" ),
+        ( False, "F", "This AFV may be equi" ),
+        ( False, "G", "May be equipped with" ),
+        ( False, "N", "This vehicle was use" ),
+        ( False, "Y", "If the scenario date" ),
+        ( True, "A", "Use U.S. Vehicle Not" ),
+        ( True, "B", "A vehicle of the sam" ),
+        ( True, "C", "A vehicle of the sam" ),
+        # NOTE: It's less than ideal that we get notes appearing twice (e.g. once as "C and once as "US C"),
+        # but it will only happen if the scenario has different variants of the same counter e.g. a M4A1 and M4A1C,
+        # so we can live with it for now...
+        ( True, "US C", "37mm canister has 12" ),
+        ( True, "US F", "This AFV may be equi" ),
+        ( True, "US G", "May be equipped with" ),
+        ( True, "US N", "This vehicle was use" ),
+        ( True, "US Y", "If the scenario date" ),
+    ], transform=_extract_extn_ma_notes )
+
+# ---------------------------------------------------------------------
+
 def _set_test_vasl_extn( control_tests, build_info, build_info_fname="buildFile" ):
     """Install a test VASL extension file."""
     with TempFile() as temp_file:
@@ -181,3 +319,21 @@ def _check_warning_msgs( control_tests, expected ):
             assert warnings[0].startswith( expected )
     else:
         assert not warnings
+
+def _extract_ma_notes( clipboard ):
+    """Extract the multi-applicable notes from a snippet."""
+    return [
+        mo.group(1).strip()
+        for mo in re.finditer( r'<div class="ma-note">(.*?)</div>', clipboard, re.DOTALL )
+    ]
+
+def _extract_extn_ma_notes( clipboard ): #pylint: disable=missing-docstring
+    """Extract the multi-applicable notes from a snippet, checking for extensions."""
+    ma_notes = _extract_ma_notes( clipboard )
+    # NOTE: We return the first few characters of the multi-applicable note content,
+    # just enough for us to determine whether we're showing the right one or not.
+    for i,ma_note in enumerate(ma_notes):
+        is_extn = "&#x2756;" in ma_note
+        mo = re.search( r"<span class='key'>(.+?):</span>(.*)", ma_note )
+        ma_notes[i] = is_extn, mo.group(1).strip(), mo.group(2).strip()[:20]
+    return ma_notes
diff --git a/vasl_templates/webapp/tests/test_vehicles_ordnance.py b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
index a0bead6..a11ec6e 100644
--- a/vasl_templates/webapp/tests/test_vehicles_ordnance.py
+++ b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
@@ -363,8 +363,15 @@ def test_common_vo( webapp, webdriver ):
         for vo_type in ("vehicles","ordnance"):
 
             # get the vehicles/ordnance
+            last_warning_marker = set_stored_msg_marker( "_last-warning_" )
             elem = find_child( "#ob_{}-add_1".format( vo_type ) )
             elem.click()
+            last_warning = get_stored_msg( "_last-warning_" )
+            if nat in ["thai","indonesian","anzac","burmese","filipino"]: # nb: these are in the BFP extension
+                assert last_warning.startswith( "There are no" )
+                continue
+            else:
+                assert last_warning == last_warning_marker
             vo_entries = find_children( "#select-vo .select2-results li" )
             vo_entries = [ get_vo_entry(e) for e in vo_entries ]
             click_dialog_button( "Cancel" )
diff --git a/vasl_templates/webapp/tests/test_vo_notes.py b/vasl_templates/webapp/tests/test_vo_notes.py
index 50f4509..dc4082a 100644
--- a/vasl_templates/webapp/tests/test_vo_notes.py
+++ b/vasl_templates/webapp/tests/test_vo_notes.py
@@ -366,6 +366,12 @@ def test_special_cases( webapp, webdriver ):
     not pytest.config.option.vo_notes, #pylint: disable=no-member
     reason = "--vo-notes not specified"
 ) #pylint: disable=too-many-locals,too-many-branches
+# NOTE: The expected output files contain pieces from the supported extensions,
+# so the VASL extensions directory must be loaded.
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+    ) #pylint: disable=too-many-locals
 def test_vo_notes_reports( webapp, webdriver ):
     """Check the vehicle/ordnance notes reports."""
 
@@ -375,6 +381,7 @@ def test_vo_notes_reports( webapp, webdriver ):
     init_webapp( webapp, webdriver,
         reset = lambda ct:
             ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
               .set_vo_notes_dir( dtype="real" )
     )
 
@@ -393,9 +400,10 @@ def test_vo_notes_reports( webapp, webdriver ):
         for vo_type in ["vehicles","ordnance"]:
 
             # get the next report
-            if nat == "landing-craft" and vo_type == "ordnance":
-                continue
             vo_notes, ma_notes, keys = get_vo_notes_report( webapp, webdriver, nat, vo_type )
+            if nat in ("burmese","filipino") or (nat,vo_type) in [("landing-craft","ordnance"),("anzac","ordnance")]:
+                assert not vo_notes and not ma_notes and not keys
+                continue
 
             # convert the report to plain-text
             buf = io.StringIO()
@@ -431,7 +439,7 @@ def test_vo_notes_reports( webapp, webdriver ):
 
             # check the report
             fname = os.path.join( check_dir, fname )
-            assert open(fname,"r",encoding="utf-8").read() == report
+            assert open( fname, "r", encoding="utf-8" ).read() == report
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -467,7 +475,7 @@ def _parse_report( buf ):
         val = val.replace( "&#8804;", "&le;" ).replace( "&#8805;", "&ge;" )
         val = val.replace( "&#176;", "&deg;" )
         val = val.replace( "&#8734;", "&infin;" )
-        val = val.replace( "&#228;", "&auml;" ).replace( "&#235;", "&euml;" )
+        val = val.replace( "&#228;", "&auml;" ).replace( "&#235;", "&euml;" ).replace( "&#252;", "&uml;" )
         val = val.replace( "&#188;", "&frac14;" ).replace( "&#189;", "&frac12;" ).replace( "&#190;", "&frac34;" )
         val = re.sub(
             r"<sup>(.*?)</sup>",
diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py
index a4b94aa..4e2c79e 100644
--- a/vasl_templates/webapp/tests/test_vo_reports.py
+++ b/vasl_templates/webapp/tests/test_vo_reports.py
@@ -5,23 +5,35 @@ import io
 import shutil
 import re
 
+import pytest
 import lxml.html
 import lxml.etree
 import tabulate
 
 import vasl_templates.webapp.tests.utils as test_utils
-from vasl_templates.webapp.tests.utils import get_nationalities, find_child, wait_for
+from vasl_templates.webapp.tests.utils import init_webapp, get_nationalities, find_child, wait_for
 
 # ---------------------------------------------------------------------
 
+# NOTE: The expected output files contain pieces from the supported extensions,
+# so the VASL extensions directory must be loaded.
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+    ) #pylint: disable=too-many-locals
 def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
     """Check the vehicle/ordnance reports."""
 
     # initialize
-    check_dir = os.path.join( os.path.split(__file__)[0], "fixtures/vo-reports/" )
-    save_dir = None # nb: define this to save the generated reports
+    init_webapp( webapp, webdriver,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" )
+    )
 
     # initialize
+    check_dir = os.path.join( os.path.split(__file__)[0], "fixtures/vo-reports/" )
+    save_dir = None # nb: define this to save the generated reports
     if save_dir and os.path.isdir(save_dir):
         shutil.rmtree( save_dir )
 
@@ -45,18 +57,21 @@ def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
 
                 # get the next report
                 results = get_vo_report( webapp, webdriver, vo_type, nat, "ETO", year, 1 )
+                if nat in ("burmese","filipino") or (nat,vo_type) in [("anzac","ordnance")]:
+                    assert not results
+                    continue
 
                 # FUDGE! The "capabilities" and "notes" columns span 2 columns each,
                 # so we add dummy header columns to stop tabulate from getting confused :-/
-                assert results[0][-1] == "Notes"
-                results[0].insert( len(results[0])-1, "#" )
-                assert results[0][-3] == "Capabilities"
-                results[0].insert( len(results[0])-2, "(effective)" )
+                assert results[0][-2] == "Notes"
+                results[0].insert( len(results[0])-2, "#" )
+                assert results[0][-4] == "Capabilities"
+                results[0].insert( len(results[0])-3, "(effective)" )
 
                 # fix up date-based capabilities
-                fixup_capabilities( -4, "Capabilities" )
-                fixup_capabilities( -3, "(effective)" )
-                fixup_capabilities( -2, "#" )
+                fixup_capabilities( -5, "Capabilities" )
+                fixup_capabilities( -4, "(effective)" )
+                fixup_capabilities( -3, "#" )
 
                 # convert the report to plain-text
                 buf = io.StringIO()
@@ -87,10 +102,10 @@ def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
     results = _parse_report( webdriver.page_source )
 
     # convert the report to plain-text
-    assert results[0][-1] == "Notes"
-    results[0].insert( len(results[0])-1, "#" )
-    assert results[0][-3] == "Capabilities"
-    results[0].insert( len(results[0])-2, "(effective)" )
+    assert results[0][-2] == "Notes"
+    results[0].insert( len(results[0])-2, "#" )
+    assert results[0][-4] == "Capabilities"
+    results[0].insert( len(results[0])-3, "(effective)" )
     buf = io.StringIO()
     print( "=== landing craft ===", file=buf )
     print( "", file=buf )
diff --git a/vasl_templates/webapp/tests/utils.py b/vasl_templates/webapp/tests/utils.py
index 5463e3a..96e13eb 100644
--- a/vasl_templates/webapp/tests/utils.py
+++ b/vasl_templates/webapp/tests/utils.py
@@ -5,6 +5,7 @@ import urllib.request
 import json
 import time
 import re
+import typing
 import uuid
 from collections import defaultdict
 
@@ -503,7 +504,10 @@ def wait_for_clipboard( timeout, expected, contains=None, transform=None ):
         if transform:
             clipboard = transform( clipboard )
         if contains is None:
-            return expected == clipboard
+            if isinstance( expected, typing.re.Pattern ):
+                return expected.search( clipboard ) is not None
+            else:
+                return expected == clipboard
         elif contains is True:
             return expected in clipboard
         elif contains is False:
diff --git a/vasl_templates/webapp/utils.py b/vasl_templates/webapp/utils.py
index b2db34e..11f377c 100644
--- a/vasl_templates/webapp/utils.py
+++ b/vasl_templates/webapp/utils.py
@@ -142,7 +142,7 @@ def is_image_file( fname ):
     if fname.startswith( "." ):
         extn = fname
     else:
-        extn = os.path.splitext( fname )[0]
+        extn = os.path.splitext( fname )[1]
     return extn.lower() in (".png",".jpg",".jpeg",".gif")
 
 def is_empty_file( fname ):
diff --git a/vasl_templates/webapp/vo.py b/vasl_templates/webapp/vo.py
index 91e50df..94eaf60 100644
--- a/vasl_templates/webapp/vo.py
+++ b/vasl_templates/webapp/vo.py
@@ -72,6 +72,8 @@ def _do_get_listings( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     listings["british"].append( lc )
 
     # apply any changes for VASL extensions
+    # NOTE: We do this here, rather than in VaslMod, because VaslMod is a wrapper around a VASL module, and so
+    # only knows about GPID's and counter images, rather than Chapter H pieces and piece ID's (e.g. "ge/v:001").
     vasl_mod = get_vasl_mod()
     if vasl_mod:
         # build an index of the pieces
@@ -81,36 +83,51 @@ def _do_get_listings( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                 piece_index[ piece["id"] ] = piece
         # process each VASL extension
         for extn in vasl_mod.get_extns():
-            if vo_type not in extn[1]:
-                continue
-            _apply_extn_info( extn[0], extn[1], piece_index, vo_type )
+            _apply_extn_info( listings, extn[0], extn[1], piece_index, vo_type )
+
+    # update nationality variants with the listings from their base nationality
+    for nat in listings:
+        if "~" not in nat:
+            continue
+        base_nat = nat.split( "~" )[0]
+        listings[nat] = listings[base_nat] + listings[nat]
 
     return jsonify( listings )
 
-def _apply_extn_info( extn_fname, extn_info, piece_index, vo_type ):
+def _apply_extn_info( listings, extn_fname, extn_info, piece_index, vo_type ):
     """Update the vehicle/ordnance listings for the specified VASL extension."""
 
     # initialize
     logger = logging.getLogger( "vasl_mod" )
-    logger.info( "Updating %s for VASL extension: %s", vo_type, os.path.split(extn_fname)[1] )
+    logger.info( "Updating %s for VASL extension '%s': %s",
+        vo_type, extn_info["extensionId"], os.path.split(extn_fname)[1]
+    )
 
     # process each entry
-    for entry in extn_info[vo_type]:
-        piece = piece_index.get( entry["id"] )
-        if piece:
-            # update an existing piece
-            logger.debug( "- Updating GPID's for %s: %s", entry["id"], entry["gpid"] )
-            if piece["gpid"]:
-                prev_gpids = piece["gpid"]
-                if not isinstance( piece["gpid"], list ):
-                    piece["gpid"] = [ piece["gpid"] ]
-                piece["gpid"].extend( entry["gpid"] )
+    for nat in extn_info:
+        if not isinstance( extn_info[nat], dict ):
+            continue
+        for entry in extn_info[nat].get( vo_type, [] ):
+            piece = piece_index.get( entry["id"] )
+            if piece:
+                # update an existing piece
+                logger.debug( "- Updating GPID's for %s: %s", entry["id"], entry["gpid"] )
+                if piece["gpid"]:
+                    prev_gpids = piece["gpid"]
+                    if not isinstance( piece["gpid"], list ):
+                        piece["gpid"] = [ piece["gpid"] ]
+                    piece["gpid"].extend( entry["gpid"] )
+                else:
+                    prev_gpids = "(none)"
+                    piece["gpid"] = entry["gpid"]
+                logger.debug( "  - %s => %s", prev_gpids, piece["gpid"] )
             else:
-                prev_gpids = "(none)"
-                piece["gpid"] = entry["gpid"]
-            logger.debug( "  - %s => %s", prev_gpids, piece["gpid"] )
-        else:
-            logger.warning( "- Updating V/O entry with extension info not supported: %s", entry["id"] )
+                # add a new piece
+                if nat not in listings:
+                    listings[ nat ] = []
+                entry[ "extn_id" ] = extn_info[ "extensionId" ]
+                listings[ nat ].append( entry )
+
 # ---------------------------------------------------------------------
 
 @app.route( "/<vo_type>/<nat>/<theater>/<int:year>", defaults={"month":1}  )
diff --git a/vasl_templates/webapp/vo_notes.py b/vasl_templates/webapp/vo_notes.py
index 283393f..75810d8 100644
--- a/vasl_templates/webapp/vo_notes.py
+++ b/vasl_templates/webapp/vo_notes.py
@@ -9,6 +9,7 @@ from collections import defaultdict
 from flask import render_template, jsonify, abort
 
 from vasl_templates.webapp import app
+from vasl_templates.webapp.file_server.vasl_mod import get_vasl_mod
 from vasl_templates.webapp.files import FileServer
 from vasl_templates.webapp.utils import resize_image_response, is_image_file, is_empty_file
 
@@ -32,7 +33,7 @@ def get_ordnance_notes():
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branches
+def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-statements,too-many-locals,too-many-branches
     """Load the Chapter H notes."""
 
     # check if we already have the vehicle/ordnance notes
@@ -52,6 +53,13 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
         global _vo_notes_file_server
         _vo_notes_file_server = FileServer( dname )
 
+    # generate a list of extension ID's
+    extn_ids = {}
+    vasl_mod = get_vasl_mod()
+    if vasl_mod:
+        extns = vasl_mod.get_extns()
+        extn_ids = set( e[1]["extensionId"] for e in extns )
+
     def get_ma_note_key( nat, fname ):
         """Get the key for a multi-applicable note."""
         # NOTE: Windows has a case-insensitive file system, so we adopt the following convention:
@@ -69,10 +77,21 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                 fname = fname[0] + fname[1].lower()
             return fname
 
-    # load the vehicle/ordnance notes
+    # initialize
     vo_notes = { "vehicles": defaultdict(dict), "ordnance": defaultdict(dict) }
+    # NOTE: We don't have any data files for these vehicles/ordnance, but they have
+    # multi-applicable notes, so we force them to appear in the final results.
+    vo_notes["vehicles"]["anzac"] = {}
+    vo_notes["ordnance"]["indonesian"] = {}
+
+    # load the vehicle/ordnance notes
     for root,_,fnames in os.walk( dname, followlinks=True ):
         dname2, vo_type2 = os.path.split( root )
+        if vo_type2 in extn_ids:
+            extn_id = vo_type2
+            dname2, vo_type2 = os.path.split( dname2 )
+        else:
+            extn_id = None
         if vo_type2 not in ("vehicles","ordnance","landing-craft"):
             continue
         if os.path.split( dname2 )[1] == "tests":
@@ -94,11 +113,15 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     continue # nb: ignore placeholder files
                 prefix = os.path.commonpath( [ dname, fname ] )
                 if prefix:
+                    if extn_id:
+                        key = "{}:{}".format( extn_id, key )
                     vo_notes[vo_type2][nat2][key] = fname[len(prefix)+1:]
                 else:
                     logging.warning( "Unexpected vehicle/ordnance note path: %s", fname )
             elif extn == ".html":
                 key = get_ma_note_key( nat2, fname )
+                if extn_id:
+                    key = "{}:{}".format( extn_id, key )
                 with open( os.path.join(root,fname), "r" ) as fp:
                     buf = fp.read().strip()
                     if not buf:
@@ -106,7 +129,16 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     if buf.startswith( "<p>" ):
                         buf = buf[3:].strip()
                     ma_notes[key] = buf
-        vo_notes[vo_type2][nat2]["multi-applicable"] = ma_notes
+        if "multi-applicable" in vo_notes[ vo_type2 ][ nat2 ]:
+            vo_notes[ vo_type2 ][ nat2 ][ "multi-applicable" ].update( ma_notes )
+        else:
+            vo_notes[ vo_type2 ][ nat2 ][ "multi-applicable" ] = ma_notes
+
+    # update nationality variants with the notes from their base nationality
+    for vo_type2 in vo_notes:
+        # FUDGE! The Chinese GMD don't have any vehicles/ordnance of their own, so we have to do this manually.
+        if "chinese" in vo_notes[vo_type2]:
+            vo_notes[vo_type2]["chinese~gmd"] = vo_notes[vo_type2]["chinese"]
 
     with _vo_notes_lock:
         # install the new vehicle/ordnance notes