Minor tweaks and corrections to smart comments.

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 Portee<sup>41-8/43</sup> ?}", "{? 01/1941-08/1943 | Portee Fire OK [EXC: Bnd (F)F NA] | | Portee Fire<sup>41-8/43</sup> ?}" ],
+  "comments": [ "QSU", "CA restrictions", "{? 01/1941-08/1943 | En Portee (3-ton lorry) <ul> <li> Portee Fire OK [EXC: Bnd (F)F NA] </ul> | En Portee NA | En Portee<sup>41-8/43</sup> ?}" ],
   "note_number": "6\u2020",
   "notes": [ "B", "N", "P" ],
   "id": "br/o:006",

vasl_templates/webapp/data/vehicles/german.json

@@ -484,7 +484,7 @@
   "note_number": "47",
   "notes": [ "E", "G", "N<sup>F</sup>" ],
   "disabled_comments": [ "G" ],
-  "comments": [ "{? 01/1943- | CE +3 F | | CE +3 F<sup>43+</sup> ?}" ],
+  "comments": [ "{? 01/1943- | CE: +3 Front | | CE: +3 Front<sup>43+</sup> ?}" ],
   "id": "ge/v:054",
   "gpid": 2646
 },

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 Portee<sup>41-8/43</sup> ?}",
-            "{? 01/1941-08/1943 | Portee Fire OK | | Portee Fire<sup>41-8/43</sup> ?}"
-        ]
+        "P": "{? 01/1941-08/1943 | En Portee (Opel truck) <ul> <li> Portee Fire OK </ul> | En Portee NA | En Portee<sup>41-8/43</sup> ?}"
     }
 },
 
@@ -56,7 +53,7 @@
     "vehicles": {
         "B": "BMG: +1 DRM vs Moving/Motion",
         "D": [ "(Un)load &times;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",

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†<sup>1</sup> 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†<sup>1</sup> 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

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†

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†

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†

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† N<sup>T</sup>  QSU | Use APCR TK vs AFV | &#8734; 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    N<sup>T</sup>     QSU

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† N<sup>T</sup>  QSU | Use APCR TK vs AFV | &#8734; 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    N<sup>T</sup>     QSU

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† N<sup>T</sup>  QSU | Use APCR TK vs AFV | &#8734; 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    N<sup>T</sup>     QSU

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             sP5 CS 7                 25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7              26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]         31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                     37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                     38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                     39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                     41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             sP5 CS 7                 25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7              26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]         31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                     37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                     38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                     39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                     41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             sP5 CS 7                 25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7              26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]         31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                     37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                     38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                     39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                     41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             sP5 CS 7                 25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7              26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]         31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                     37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                     38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                     39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                     41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             sP5 CS 7                 25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7              26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                     30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]         31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                     37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                     38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                     39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                     41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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†<sup>1</sup>
 M36 GMC              A5[5] sP5 CS 7                             A5 sP5 CS 7                  25†     <s>P</s>
 M36B1 GMC            A5 sP5 CS 7                                A5 sP5 CS 7                  26      <s>P</s>
-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 &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50 cal MA only | Independent AAMG's
-M3(HMG)              CS 5                                       CS 5                         30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; 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 <s>P</s>                                                               {{4|MA|4*|4*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
+M3(HMG)              CS 5                                       CS 5                         30†     E† H N <s>P</s>                                                               {{4|MA|6*|6*}} | MA: 12.7 | Inherent Crew &amp; Passenger | Crew: .50-cal MA only | Independent AAMG's
 M4 MC                WP8 CS 4[brewup]                           WP8 CS 4[brewup]             31†     J† M†<sup>1</sup> N O†<sup>2</sup> <s>P</s>                                   +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†<sup>1</sup> M†<sup>2</sup> O†<sup>3</sup>                                  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† <s>P</s>                                                                 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†<sup>1</sup> N O†<sup>1</sup> <s>P</s>                                      AAMG: Removal OK (.50-cal HMG) | Ammo trailer (0 AF) | AAMG: NA VCA
 M15A1 MGMC           CS 4                                       CS 4                         37†     N V† AA†<sup>1</sup>                                                          CMG Removal/Scrounge NA | CMG: Normal Range = 16 | Turret Rear unarmored [EXC: N.Africa] | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
 M16 MGMC             CS 4                                       CS 4                         38†     V† AA†<sup>1</sup>                                                            MA Removal/Scrounge NA | MA: [16] TH | 4 TK DR | CE: +1 Side/Rear Turret | MA &amp; CMG: VCA &#8804; level NA | MA &amp; CMG: AA ok
-M3A1                 CS 4                                       CS 4                         39†[1]  E† H I† N                                                                     Inherent Crew &amp; 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 &amp; 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†<sup>3</sup> O†<sup>2</sup> W†<sup>1</sup> Z                                MA: 12.7 | (Un)load &#215;2 | Pas: Mounted Fire | Unpossessed SW ok | MG Removal OK | Reverse MP &#215;4 | BAZ
 T8                   CS 5                                       CS 5                         41†     O†<sup>1</sup> <s>P</s>                                                       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†<sup>2</sup> G W†<sup>1</sup>                                               Reverse MP &#215;4

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#)

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#)

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#)

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#)

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#)

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#)

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† 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>                  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 N<sup>F</sup>                  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

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† 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>                  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 N<sup>F</sup>                  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

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† 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>                  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 N<sup>F</sup>                  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

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Red TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Red TH# | Lend-Lease

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Red TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Red TH# | Lend-Lease

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Red TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Red TH# | Lend-Lease

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Red TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | Red TH# | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Red TH# | Lend-Lease

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Black TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Black TH# | Lend-Lease

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†<sup>1</sup> Br N<sup>T</sup> LL                      Black TH# | Lend-Lease
 Valentine VIII(b)     HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2†   Br N<sup>T</sup> 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 &amp; 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 &amp; 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 &amp; 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 &amp; HS Passenger | Black TH# | Lend-Lease
 M5(a)                 cs 5†[1]                                     cs 5†[1]                 55      Br A Br I†<sup>1</sup> 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†<sup>1</sup> LL                           CE: +1 Side/Rear Turret | MA: VCA &#8804; level NA | 4 TK DR | American ESB+ | MA: [16] TH | MA: Removal/Scrounge NA | MA &amp; CMG: AA ok | Black TH# | Lend-Lease