diff --git a/vasl_templates/webapp/data/ordnance/british.json b/vasl_templates/webapp/data/ordnance/british.json
index f200d21..20591c6 100644
--- a/vasl_templates/webapp/data/ordnance/british.json
+++ b/vasl_templates/webapp/data/ordnance/british.json
@@ -54,7 +54,7 @@
{ "name": "OQF 6-Pounder 7-cwt",
"type": "AT",
"capabilities2": { "HE": [ [7,"F3"], [8,"4+"], "\u2020" ], "D": [ [6,"J4E"], [7,5], "\u2020" ] },
- "comments": [ "QSU", "CA restrictions", "{? 01/1941-08/1943 | En Portee (3-ton lorry) | En Portee NA | En Portee41-8/43 ?}", "{? 01/1941-08/1943 | Portee Fire OK [EXC: Bnd (F)F NA] | | Portee Fire41-8/43 ?}" ],
+ "comments": [ "QSU", "CA restrictions", "{? 01/1941-08/1943 | En Portee (3-ton lorry)
- Portee Fire OK [EXC: Bnd (F)F NA]
| En Portee NA | En Portee41-8/43 ?}" ],
"note_number": "6\u2020",
"notes": [ "B", "N", "P" ],
"id": "br/o:006",
diff --git a/vasl_templates/webapp/data/vehicles/german.json b/vasl_templates/webapp/data/vehicles/german.json
index 8163164..81bc98f 100644
--- a/vasl_templates/webapp/data/vehicles/german.json
+++ b/vasl_templates/webapp/data/vehicles/german.json
@@ -484,7 +484,7 @@
"note_number": "47",
"notes": [ "E", "G", "NF" ],
"disabled_comments": [ "G" ],
- "comments": [ "{? 01/1943- | CE +3 F | | CE +3 F43+ ?}" ],
+ "comments": [ "{? 01/1943- | CE: +3 Front | | CE: +3 Front43+ ?}" ],
"id": "ge/v:054",
"gpid": 2646
},
diff --git a/vasl_templates/webapp/data/vo-comments.json b/vasl_templates/webapp/data/vo-comments.json
index e250113..4350c34 100644
--- a/vasl_templates/webapp/data/vo-comments.json
+++ b/vasl_templates/webapp/data/vo-comments.json
@@ -25,10 +25,7 @@
"ordnance": {
"A": [ "Use APCR TK vs AFV", "∞ APCR" ],
"O": "Animal-Packed",
- "P": [
- "{? 01/1941-08/1943 | En Portee (Opel truck) | En Portee NA | En Portee41-8/43 ?}",
- "{? 01/1941-08/1943 | Portee Fire OK | | Portee Fire41-8/43 ?}"
- ]
+ "P": "{? 01/1941-08/1943 | En Portee (Opel truck) | En Portee NA | En Portee41-8/43 ?}"
}
},
@@ -56,7 +53,7 @@
"vehicles": {
"B": "BMG: +1 DRM vs Moving/Motion",
"D": [ "(Un)load ×2", "Pas: Mounted Fire", "Unpossessed SW ok", "MG Removal OK" ],
- "E": "Crew: .50 cal MA only",
+ "E": "Crew: .50-cal MA only",
"H": "Independent AAMG's",
"I": [ "{{4|MA|2*}}", "AAMG: Removal OK" ],
"J": "MA: Rear VCA only",
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 6d5e35e..3c7a386 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,14 +1,14 @@
=== ordnance/british/1941 ===
Name Capabilities (effective) # Notes Comments
----------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
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 d3ae50a..80b6774 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,14 +1,14 @@
=== ordnance/british/1942 ===
Name Capabilities (effective) # Notes Comments
----------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
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 d436af6..941cb9d 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,14 +1,14 @@
=== ordnance/british/1943 ===
Name Capabilities (effective) # Notes Comments
----------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
index 5a1d456..8da25eb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
@@ -1,14 +1,14 @@
=== ordnance/british~canadian/1941 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
index 474b420..7387e16 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
@@ -1,14 +1,14 @@
=== ordnance/british~canadian/1942 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
index 08e8cb4..e798fbb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
@@ -1,14 +1,14 @@
=== ordnance/british~canadian/1943 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
index 40e1e5e..bc28842 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
@@ -1,14 +1,14 @@
=== ordnance/british~newzealand/1941 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
index dbd56d5..c7e0eaf 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
@@ -1,14 +1,14 @@
=== ordnance/british~newzealand/1942 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
index 4565e5b..63f8b71 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
@@ -1,14 +1,14 @@
=== ordnance/british~newzealand/1943 ===
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------
+--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P En Portee (30-cwt lorry)
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† 6† B N P QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
OQF 17/25-Pounder 7 N
OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
OQF M1A1 75mm Pack Howitzer H6 WP7 H6 WP7 9† D P QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
index 16610e2..a16717e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
@@ -12,7 +12,7 @@ M1 81mm Mortar WP8 WP8 Fr
Boys ATR Fr 4† Fr B No Long Range
OQF 25mm Hotchkiss Fr 23†[1] Fr V Fr W† QSU | En Portee (15-cwt truck) | No Captured Use penalty for Vichy French
Canon AC de 47 SA 37 APX(f) Fr 6†[1] Fr B Fr G† Fr P Fr V QSU | APCR only | En Portee (Renault AGR2) [{ *:Motion Fire NA }] | MA: B# = 12 | No Captured Use penalty for Vichy French
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
M1 57mm AT Gun D4[J4+E]† HE7[J4E]7[5]† Fr 24 Fr Y† QSU
Canon de 75 mle 1897 s8 s8 Fr 25†[1] Fr V Fr W† QSU | En Portee (3-ton lorry) | No Captured Use penalty for Vichy French
OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 Fr 26†[1] Fr W†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
index af7ed77..501e14a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
@@ -12,7 +12,7 @@ M1 81mm Mortar WP8 WP8 Fr
Boys ATR Fr 4† Fr B No Long Range
OQF 25mm Hotchkiss Fr 23†[1] Fr V Fr W† QSU | En Portee (15-cwt truck) | No Captured Use penalty for Vichy French
Canon AC de 47 SA 37 APX(f) Fr 6†[1] Fr B Fr G† Fr P Fr V QSU | APCR only | En Portee (Renault AGR2) [{ *:Motion Fire NA }] | MA: B# = 12 | No Captured Use penalty for Vichy French
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
M1 57mm AT Gun D4[J4+E]† HE7[J4E]7[5]† Fr 24 Fr Y† QSU
Canon de 75 mle 1897 s8 s8 Fr 25†[1] Fr V Fr W† QSU | En Portee (3-ton lorry) | No Captured Use penalty for Vichy French
OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 Fr 26†[1] Fr W†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
index 00c710d..b5a2173 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
@@ -12,7 +12,7 @@ M1 81mm Mortar WP8 WP8 Fr
Boys ATR Fr 4† Fr B No Long Range
OQF 25mm Hotchkiss Fr 23†[1] Fr V Fr W† QSU | En Portee (15-cwt truck) | No Captured Use penalty for Vichy French
Canon AC de 47 SA 37 APX(f) Fr 6†[1] Fr B Fr G† Fr P Fr V QSU | APCR only | En Portee (Renault AGR2) [{ *:Motion Fire NA }] | MA: B# = 12 | No Captured Use penalty for Vichy French
-OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) | Portee Fire OK [EXC: Bnd (F)F NA]
+OQF 6-Pounder 7-cwt D6[J4E]7[5]† HE7[F3]8[4+]† Fr 24 Fr W† QSU | CA restrictions | En Portee (3-ton lorry) [{ *:Portee Fire OK [EXC: Bnd (F)F NA] }]
M1 57mm AT Gun D4[J4+E]† HE7[J4E]7[5]† Fr 24 Fr Y† QSU
Canon de 75 mle 1897 s8 s8 Fr 25†[1] Fr V Fr W† QSU | En Portee (3-ton lorry) | No Captured Use penalty for Vichy French
OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 Fr 26†[1] Fr W†
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 d5840f8..b279a67 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,13 +1,13 @@
=== ordnance/german/1941 ===
Name Capabilities (effective) # Notes Comments
------------------------- ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------------
5cm leGrW 1 N
8cm GrW 34 IR s8 IR s8 2† N QSU
10cm NbW 35 s10 s10 3 O QSU | Animal-Packed
12cm GrW 42 s8 s8 4† n/a QSU
-2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) | Portee Fire OK
-3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A4 H6[9]† 6 B† N P QSU | En Portee (Opel truck) | Portee Fire OK
+2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) [{ *:Portee Fire OK }]
+3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A4 H6[9]† 6 B† N P QSU | En Portee (Opel truck) [{ *:Portee Fire OK }]
4.2cm lePaK 41 7 A† NT QSU | Use APCR TK vs AFV | ∞ APCR
5cm PaK 38 A5[1]6[2]5[3]4[4] A5 8† N QSU
7.5cm PaK 97/38 H6 s7 H6 s7 9 NT QSU
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 3b50e7a..bf66ac0 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,13 +1,13 @@
=== ordnance/german/1942 ===
Name Capabilities (effective) # Notes Comments
------------------------- ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------------
5cm leGrW 1 N
8cm GrW 34 IR s8 IR s8 2† N QSU
10cm NbW 35 s10 s10 3 O QSU | Animal-Packed
12cm GrW 42 s8 s8 4† n/a QSU
-2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) | Portee Fire OK
-3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A5 H6[9]† 6 B† N P QSU | En Portee (Opel truck) | Portee Fire OK
+2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) [{ *:Portee Fire OK }]
+3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A5 H6[9]† 6 B† N P QSU | En Portee (Opel truck) [{ *:Portee Fire OK }]
4.2cm lePaK 41 7 A† NT QSU | Use APCR TK vs AFV | ∞ APCR
5cm PaK 38 A5[1]6[2]5[3]4[4] A6 8† N QSU
7.5cm PaK 97/38 H6 s7 H6 s7 9 NT QSU
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 f4ed556..c464642 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,13 +1,13 @@
=== ordnance/german/1943 ===
Name Capabilities (effective) # Notes Comments
------------------------- ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- ---------------------------------------------------------------------------------------
5cm leGrW 1 N
8cm GrW 34 IR s8 IR s8 2† N QSU
10cm NbW 35 s10 s10 3 O QSU | Animal-Packed
12cm GrW 42 s8 s8 4† n/a QSU
-2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) | Portee Fire OK
-3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A4 H6[9]† 6 B† N P QSU | En Portee (Opel truck) | Portee Fire OK
+2.8cm sPzB 41 5† A† N P QSU | Use APCR TK vs AFV | ∞ APCR | En Portee (Opel truck) [{ *:Portee Fire OK }]
+3.7cm PaK 35/36 A4[1]5[2]4[3]3[4] H6[9]† A4 H6[9]† 6 B† N P QSU | En Portee (Opel truck) [{ *:Portee Fire OK }]
4.2cm lePaK 41 7 A† NT QSU | Use APCR TK vs AFV | ∞ APCR
5cm PaK 38 A5[1]6[2]5[3]4[4] A5 8† N QSU
7.5cm PaK 97/38 H6 s7 H6 s7 9 NT QSU
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 178889c..f859c29 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
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 d3916aa..c54a948 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
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 5ca8f01..7ec7c70 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
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 3e0a970..5810b58 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
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 ee1b46b..cb3aa03 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 A5†[1] sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
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 2e30956..84ee93a 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
@@ -30,11 +30,11 @@ M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 A6†[1] s5 sP
M18 GMC A5[4E]6[5E]†[1] s5[5] sP5 CS 6 A6†[1] s5 sP5 CS 6 24† A†1
M36 GMC A5[5] sP5 CS 7 A5 sP5 CS 7 25† P
M36B1 GMC A5 sP5 CS 7 A5 sP5 CS 7 26 P
-M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 27†[1] E† H I† N MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 28† N MA: As MMG for TK & Removal
-M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
-M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50 cal MA only | Independent AAMG's
+M3A1 CS 5 CS 5 29†[1] E† H I† Z MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | BAZ
+M3(MMG) CS 5 CS 5 30† E† H N P {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG) CS 5 CS 5 30† E† H N P {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew & Passenger | Crew: .50-cal MA only | Independent AAMG's
M4 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 31† J† M†1 N O†2 P +1 TH DRM vs Moving/Motion | Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M4A1 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 32† J†1 M†2 O†3 Inherent Infantry Crew | AAMG: Removal OK (MMG) | MA: Rear VCA only | MTR: Removal OK
M21 MC WP8 CS 4[brewup] WP8 CS 4[brewup] 33 M O† P Inherent Infantry Crew | AAMG: Removal OK (HMG) | MTR: Removal OK
@@ -43,7 +43,7 @@ T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4
T19 HMC H5 WP8 s7 CS 4 H5 WP8 s7 CS 4 36† K†1 N O†1 P AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
M15A1 MGMC CS 4 CS 4 37† N V† AA†1 CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
M16 MGMC CS 4 CS 4 38† V† AA†1 MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA & CMG: VCA ≤ level NA | MA & CMG: AA ok
-M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 39†[1] E† H I† N Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 40† D†3 O†2 W†1 Z MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
T8 CS 5 CS 5 41† O†1 P MA: 12.7 | As fully-tracked | AAMG: Removal OK (.50-cal HMG)
M8 C7†[2] sP5 CS 4 C7†[2] sP5 CS 4 42† C†2 G W†1 Reverse MP ×4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1940.txt
index 2a65fff..aa9ef0e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1940.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1941.txt
index f026175..4968f19 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1941.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1942.txt
index 3cbd650..81d66d2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1942.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1943.txt
index d9f5f8f..fa7e189 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1943.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1944.txt
index 1511f58..c3275f5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1944.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 sD4† CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 C4†[1] H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1945.txt
index afd4d93..b03a3a3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/free-french/1945.txt
@@ -20,7 +20,7 @@ B1-bis(f) ®9†[1] AP9[75]† CS 5[brewup] ®9†
M10 GMC A5[A4E]6[5E]†[1] s5[5] sP5 CS 7 A6†[1] s5 sP5 CS 7 Fr 41 Fr Y†
Daimler sD4[4+]† CS 2 sD4† CS 2 Fr 42†[1] Fr W† Stun = Recall, CE & Fire NA
AM Dodge(a) AP10 CS 6† AP10 CS 6† Fr 15† Fr F CMG: AA ok | MA NA in AA mode | Partially armored [{ *:+2 DRM if unarmored [EXC: CC, FT, mines, height advantage, destroyed] }] | Black TH# | American ESB+ | Captured Use (unless Vichy French)
-M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M3A1 CS 4 CS 4 Fr 43†[1] Fr Y† Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M20 sP5 CS 4 sP5 CS 4 Fr 43†[1] Fr Y† MA: 12.7 | (Un)load ×2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP ×4 | BAZ
Marmon-Herrington III ME CS 4 CS 4 Fr 44 Fr W† Reverse MP ×3 | ATR: [12] TH | ATR: Removal/Scrounge OK | AAMG: Rear TCA only
Marmon-Herrington IIIv CS 4 CS 4 Fr 44 Fr W† AAMG: Rear VCA only | Red TH# | Reverse MP ×3
@@ -29,7 +29,7 @@ M8 C7†[2] sP5 CS 4 C7†[2]
M8 HMC C4[4+]†[1] H9 WP9 CS 5 C4†[1] H9 WP9 CS 5 Fr 46 Fr Y†
M7 HMC C7[P]†[1] H7 WP8 s7 CS 7 H7 WP8 s7 CS 7 Fr 46 Fr Y†
T30 HMC AP7 H5 WP9 CS 4 AP7 H5 WP9 CS 4 Fr 47 Fr Y† AAMG: Removal OK (.50-cal HMG) | AAMG: NA VCA | CE: +3 Front
-M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
+M2 CS 4 CS 4 Fr 47 Fr Y† MA: 12.7 | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK
M3 CS 5 CS 5 Fr 47 Fr Y† MA: As MMG for TK & Removal
M5 cs 5†[1] cs 5†[1] Fr 47† Fr U American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#)
M5A1 cs 5† cs 5† Fr 47† Fr U American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#)
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 63f0419..d2d0f96 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
@@ -56,7 +56,7 @@ Pz 35R 731(f) CS 2 CS 2
Marder I(f) A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 45† a French ESB
GSW 39H(f) Pak A4[4] HE9 CS 3 HE9 CS 3 45.1 a e French ESB
Marder II A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 46 M† NFT
-Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE +3 F | ESB: 0 DRM
+Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE: +3 Front | ESB: 0 DRM
Marder III(t)M A5[3] HE7 s7 sD5 CS 4[brewup] A5 HE7 s7 sD5 CS 4[brewup] 48 E ESB: 0 DRM
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† ESB: 0 DRM | AAMG: BU only, Rider NA, elevation restrictions
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 29d99b7..66ce10c 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
@@ -56,7 +56,7 @@ Pz 35R 731(f) CS 2 CS 2
Marder I(f) A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 45† a French ESB
GSW 39H(f) Pak A4[4] HE9 CS 3 A4 HE9 CS 3 45.1 a e French ESB
Marder II A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 46 M† NFT
-Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE +3 F | ESB: 0 DRM
+Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE: +3 Front | ESB: 0 DRM
Marder III(t)M A5[3] HE7 s7 sD5 CS 4[brewup] A5 HE7 s7 sD5 CS 4[brewup] 48 E ESB: 0 DRM
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† ESB: 0 DRM | AAMG: BU only, Rider NA, elevation restrictions
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 dca5e44..c63a425 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
@@ -56,7 +56,7 @@ Pz 35R 731(f) CS 2 CS 2
Marder I(f) A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 45† a French ESB
GSW 39H(f) Pak A4[4] HE9 CS 3 A4 HE9 CS 3 45.1 a e French ESB
Marder II A6[2] HE7 s7 CS 4[brewup] A6 HE7 s7 CS 4[brewup] 46 M† NFT
-Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE +3 F | ESB: 0 DRM
+Marder III(t)H A6[2] HE7 s7 sD6 CS 4[brewup] A6 HE7 s7 sD6 CS 4[brewup] 47 E G NF CE: +3 Front | ESB: 0 DRM
Marder III(t)M A5[3] HE7 s7 sD5 CS 4[brewup] A5 HE7 s7 sD5 CS 4[brewup] 48 E ESB: 0 DRM
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† ESB: 0 DRM | AAMG: BU only, Rider NA, elevation restrictions
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 27c09cd..04db84c 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
Churchill III(b) D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7 sM8† CS 7 53† N LL Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Red TH# | Lend-Lease
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 19688c8..172776c 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
Churchill III(b) D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7 sM8† CS 7 53† N LL Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Red TH# | Lend-Lease
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 148dbbc..4c75177 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
Churchill III(b) D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7 sM8† CS 7 53† N LL Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Red TH# | Lend-Lease
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 44fb45b..eb77fad 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
Churchill III(b) D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7 sM8† CS 7 53† N LL Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Red TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Red TH# | Lend-Lease
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 460bf9b..50067f3 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
Churchill III(b) D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7 HE8† sD6 sM8† CS 7 53† N LL Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Black TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Black TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Black TH# | Lend-Lease
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 63ff627..601978a 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
@@ -85,7 +85,7 @@ Valentine II(b) sM8 CS 4 sM8 CS 4
Valentine V(b) sM8 CS 4 sM8 CS 4 52.1† Br K†1 Br NT LL Black TH# | Lend-Lease
Valentine VIII(b) HE7 sD6 CS 4 HE7 sD6 CS 4 52.2† Br NT LL Black TH# | Lend-Lease
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 Steep climbs | British ESB | Black TH# | Lend-Lease
-M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50 cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Black TH# | Lend-Lease
+M3A1 Scout Car(a) CS 4 CS 4 54 US E† US H US I† US N LL Inherent Crew & Passenger | MA: 12.7 | Pas: No Mounted Fire penalty | Unpossessed SW ok | Crew: .50-cal MA only | Independent AAMG's | {{4|MA|2*}} | AAMG: Removal OK | Inherent Crew & HS Passenger | Black TH# | Lend-Lease
M5(a) cs 5†[1] cs 5†[1] 55 Br A Br I†1 Br N LL American ESB+ | MA Removal OK (.30-cal MMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M9A1(a) cs 4† cs 4† 55 Br A Br I† LL American ESB+ | MA Removal OK (.50-cal HMG) | Inherent Crew if armed (with CS#) | Lend-Lease
M17 MGMC(a) CS 4 CS 4 56 Br A Br F† Br AA†1 LL CE: +1 Side/Rear Turret | MA: VCA ≤ level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA & CMG: AA ok | Black TH# | Lend-Lease