diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index aaca571..3364ef6 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -828,7 +828,14 @@ function make_capabilities( raw, vo_entry, nat, scenario_theater, scenario_year,
if ( crew_survival )
capabilities.push( crew_survival ) ;
- return capabilities ;
+ // remove uninteresting capabilities
+ var capabilities2 = [] ;
+ for ( i=0 ; i < capabilities.length ; ++i ) {
+ if ( ["T","NT","ST"].indexOf( capabilities[i] ) === -1 )
+ capabilities2.push( capabilities[i] ) ;
+ }
+
+ return capabilities2 ;
}
function make_raw_capability( name, capability )
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
index 3da9e09..01d6e51 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1940 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
index 04dee0c..8b6d4b4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1941 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
index 047c694..b81e1aa 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1942 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
index b16b671..bce7820 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1943 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
index 542dc27..7804c2b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1944 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
index e1ef5cd..147ef3e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
@@ -1,18 +1,18 @@
=== ordnance/allied-minor-common/1945 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ----------------------- ----------------------
-Brandt Medium Mortar NT QSU s8 NT QSU s8 23† A B Gr N P Y
-37mm Bofors AT NT QSU NT QSU 24† A De P
-3.7cm PaK 35/36 NT QSU NT QSU 25† Gr Ne Y
-Bohler M35 47mm NT QSU NT QSU 26† A Gr Ne Y
-65mm wz.06 NT QSU h-d NT QSU h-d 27† A Gr P Y No Gunshield.
-75mm wz.97 NT QSU s8 NT QSU s8 28† A Gr N P
-Bofors M34 NT QSU NT QSU 29† A B Gr Ne N
-75M 19S NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 30† A Gr P Y
-C105 L 13 S NT NT 31† B P Y
-120mm wz. 09/31 NT h-d s6 NT h-d s6 32† N P
-155mm 17 S NT s8 NT s8 33 B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 34† T†1 B Gr Y Towing NA†1
-20mm Oerlikon T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
-40mm Bofors AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 36† C†1 B N Ne P
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ----------------------- ----------------------
+Brandt Medium Mortar QSU s8 QSU s8 23† A B Gr N P Y
+37mm Bofors AT QSU QSU 24† A De P
+3.7cm PaK 35/36 QSU QSU 25† Gr Ne Y
+Bohler M35 47mm QSU QSU 26† A Gr Ne Y
+65mm wz.06 QSU h-d QSU h-d 27† A Gr P Y No Gunshield.
+75mm wz.97 QSU s8 QSU s8 28† A Gr N P
+Bofors M34 QSU QSU 29† A B Gr Ne N
+75M 19S QSU h-d AP5 s6 QSU h-d AP5 s6 30† A Gr P Y
+C105 L 13 S 31† B P Y
+120mm wz. 09/31 h-d s6 h-d s6 32† N P
+155mm 17 S s8 s8 33 B Gr P Y
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 34† T†1 B Gr Y Towing NA†1
+20mm Oerlikon LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 35† C†1 Gr Ne Y
+40mm Bofors AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 36† C†1 B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
index 87fbea2..cd3e3cb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1940 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
index 1385d55..b03eb9a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1941 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
index 72e00d3..d3f0903 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1942 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
index bdc6c23..1da4f50 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1943 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU C7†[1] 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 s7 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU C7†[1] 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 s7 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
index be1c26b..a830d10 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1944 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU C7†[1] 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU A4† 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU C4†[1] H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 s7 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU C7†[1] 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU A4† 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU C4†[1] H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 s7 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
index 06705be..617a12e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
@@ -1,32 +1,32 @@
=== ordnance/american/1945 ===
-Name Capabilities (effective) # Notes Comments
--------------------------------- ---------------------------------- ---------------------------------- ------ ------------------------------- ----------------------------
-M2 60mm Mortar IR WP7[5] 5PP OBA† IR WP7 5PP OBA† 1† F N
-M19 60mm Mortar IR WP6[5] 4PP IR WP6 4PP 2 F
-M1 81mm Mortar NT QSU WP8 NT QSU WP8 3 F N
-M2 4.2-in. Mortar NT QSU WP10 NT QSU WP10 4† n/a
-T25 155mm Mortar NT WP8 NT WP8 5† P
-M3A1 37mm AT Gun NT QSU C7[A2+]†[1] NT QSU C7†[1] 6† C†1 N
-M1 57mm AT Gun NT QSU D4[J4+E]† HE7[J4E]7[5]† NT QSU D4† HE7† 7† n/a
-M5 3-in. AT Gun NT QSU A4[4]5[5]† s6[5] NT QSU A5† s6 8† P
-T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
-M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
-M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
-M1A1 75mm Pack Howitzer NT QSU C4[4+]†[1] H7 WP8 NT QSU C4†[1] H7 WP8 12† C†1 F
-M1897A2 75mm Gun NT QSU WP8 NT QSU WP8 13 P
-M2A1 105mm Howitzer NT C7[4+P]†[1] H6 WP8 s7 NT H6 WP8 s7 14† C†1 N
-M3 105mm Howitzer NT C7[P]†[1] H7 WP8 s7 NT H7 WP8 s7 15† C†1
-M1 4.5-in. Gun NT NT 16† P
-M1918 155mm Howitzer NT WP8 s7[3+] NT WP8 s7 17† N
-M1 155mm Howitzer NT WP8 s7 NT WP8 s7 18† N
-M1918M1 155mm Gun NT RFNM AP4†[1] WP8 NT RFNM AP4†[1] WP8 19† A†1 N No IF.
-M1A1 155mm Gun NT RFNM AP4†[1] WP8 s7[5] NT RFNM AP4†[1] WP8 s7 20† A†1 No IF.
-M1 8-in. Howitzer NT RFNM NT RFNM 21† n/a No IF.
-M51 Multiple .50-cal MG Carriage T LF [2 ROF, 20 IFE, B11] 4 TK DR† T LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
-M1A2 37mm AA Gun T T 23† N
-M1 40mm AA Gun T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 24† B†1
-M3 3-in. AA Gun T NM T NM 25 P
-M1A1 90mm AA Gun T NM T NM 26† N
-M2 90mm AA Gun T LF [90†, 1 ROF, B11] T LF [90†, 1 ROF, B11] 27†[1] B†
-20mm Oerlikon Mk4 T 2 TK DR's† T 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
+Name Capabilities (effective) # Notes Comments
+-------------------------------- -------------------------------- -------------------------------- ------ ------------------------------- ----------------------------
+M2 60mm Mortar IR WP7[5] 5PP OBA† IR WP7 5PP OBA† 1† F N
+M19 60mm Mortar IR WP6[5] 4PP IR WP6 4PP 2 F
+M1 81mm Mortar QSU WP8 QSU WP8 3 F N
+M2 4.2-in. Mortar QSU WP10 QSU WP10 4† n/a
+T25 155mm Mortar WP8 WP8 5† P
+M3A1 37mm AT Gun QSU C7[A2+]†[1] QSU C7†[1] 6† C†1 N
+M1 57mm AT Gun QSU D4[J4+E]† HE7[J4E]7[5]† QSU D4† HE7† 7† n/a
+M5 3-in. AT Gun QSU A4[4]5[5]† s6[5] QSU A5† s6 8† P
+T32 37mm Manpack Gun 5PP (3PP dm)† C5†[1] crewed†[2] 5PP (3PP dm)† C5†[1] crewed†[2] 9† C†1 D†2 F
+M18 57mm Recoilless Rifle 3PP crewed†[1] H7 WP6 3PP crewed†[1] H7 WP6 10 D†1 E†
+M20 75mm Recoilless Rifle 5PP crewed†[1] H7 WP7 5PP crewed†[1] H7 WP7 11 D†1 E†
+M1A1 75mm Pack Howitzer QSU C4[4+]†[1] H7 WP8 QSU C4†[1] H7 WP8 12† C†1 F
+M1897A2 75mm Gun QSU WP8 QSU WP8 13 P
+M2A1 105mm Howitzer C7[4+P]†[1] H6 WP8 s7 H6 WP8 s7 14† C†1 N
+M3 105mm Howitzer C7[P]†[1] H7 WP8 s7 H7 WP8 s7 15† C†1
+M1 4.5-in. Gun 16† P
+M1918 155mm Howitzer WP8 s7[3+] WP8 s7 17† N
+M1 155mm Howitzer WP8 s7 WP8 s7 18† N
+M1918M1 155mm Gun RFNM AP4†[1] WP8 RFNM AP4†[1] WP8 19† A†1 N No IF.
+M1A1 155mm Gun RFNM AP4†[1] WP8 s7[5] RFNM AP4†[1] WP8 s7 20† A†1 No IF.
+M1 8-in. Howitzer RFNM RFNM 21† n/a No IF.
+M51 Multiple .50-cal MG Carriage LF [2 ROF, 20 IFE, B11] 4 TK DR† LF [2 ROF, 20 IFE, B11] 4 TK DR† 22† n/a
+M1A2 37mm AA Gun 23† N
+M1 40mm AA Gun LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 24† B†1
+M3 3-in. AA Gun NM NM 25 P
+M1A1 90mm AA Gun NM NM 26† N
+M2 90mm AA Gun LF [90†, 1 ROF, B11] LF [90†, 1 ROF, B11] 27†[1] B†
+20mm Oerlikon Mk4 2 TK DR's† 2 TK DR's† 1† US P Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
index 1b65923..5ccd09a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1940 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
index 6eab7b1..aecd97f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1941 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
index 0ec4200..367b6be 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1942 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
index 3089441..77d1fc6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1943 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU A4 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU H5 s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU A4 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT H4 s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU A4 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU H5 s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU A4 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 H4 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
index 70d0571..cc6e569 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1944 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU A3 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU H5 s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU A3 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT H4 s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU A3 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU H5 s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU A3 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 H4 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
index 6271360..2148820 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
@@ -1,37 +1,37 @@
=== ordnance/axis-minor-common/1945 ===
-Name Capabilities (effective) # Notes Comments
-------------------------------- ----------------------------- ----------------------------- --- ---------------------- -------------
-5cm leGrW 36 5PP 5PP 44 A H S C B
-50mm RM obr. 40 4PP 4PP 45 A R H S C
-8cm GrW 34 NT QSU IR s7 NT QSU IR s7 46† A C B
-Brandt M27/31 NT QSU s7 NT QSU s7 47† A R H S
-PM obr. 38 NT QSU h-d s8 NT QSU h-d s8 48† R H
-Ur wz. 35 1PP 1PP 49 R H S C B
-s18-1100 5PP 5PP 50 A R H
-Kanon PUV vz. 37(t) NT QSU A4[1S] NT QSU 51† E H S B
-Bohler M35 NT QSU NT QSU 52† A R H S No Gunshield.
-5cm PaK 38(g) NT QSU A4[3]3[4] NT QSU A3 53† E R H S B
-7.5cm PaK 97/38(g) NT QSU H5[3+] s6 NT QSU H5 s6 54† E R B
-7.5cm PaK 40(g) NT QSU A4[3]3[4] NT QSU A3 55† E R H S B
-Skoda M15 NT QSU NT QSU 56† A R H S C B
-Canon de 75 mle 1897 NT QSU s7 NT QSU s7 57 R B
-Skoda M29 NT AP6 NT AP6 58† A R S
-Skoda M17 NT QSU NT QSU 59† A R S C
-Skoda M28(80) T T 60† S C
-Skoda M14/19 NT s8 NT s8 61† A† R H S C
-leFH 18(g) NT H4[3+] s5 NT H4 s5 62† E H S B
-Skoda M35 NT AP7 C7[CS]† NT AP7 63† R S C
-G obr. 10/30 NT h-d s7 NT h-d s7 64† R B
-G obr. 38 NT s5[1-2R]† NT 65 R B
-Skoda M14 NT NT 66† R H S
-Skoda M15/16 NT s6 NT s6 67† S C No IF.
-C mle 17 S NT s7 NT s7 68† R B
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR† T 2 TK DR† 69† T†1 R B
-Oerlikon FF T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
-2cm FlaK 30(g) T LF [NT, 20†[1], 2 ROF, B9] T LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
-2cm FlaK 38(g) T LF [NT, 20†[1], 2 ROF, B10] T LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
-3.7cm FlaK 36(g) T T 73† E R B
-Bofors 40mm T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 74† G†1 R H S C
-Skoda M33 T T 75R S
-8.8cm FlaK 18 o. 36(g) T LF [88†[1], 1 ROF, B11] T LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
+Name Capabilities (effective) # Notes Comments
+------------------------------- --------------------------- --------------------------- --- ---------------------- -------------
+5cm leGrW 36 5PP 5PP 44 A H S C B
+50mm RM obr. 40 4PP 4PP 45 A R H S C
+8cm GrW 34 QSU IR s7 QSU IR s7 46† A C B
+Brandt M27/31 QSU s7 QSU s7 47† A R H S
+PM obr. 38 QSU h-d s8 QSU h-d s8 48† R H
+Ur wz. 35 1PP 1PP 49 R H S C B
+s18-1100 5PP 5PP 50 A R H
+Kanon PUV vz. 37(t) QSU A4[1S] QSU 51† E H S B
+Bohler M35 QSU QSU 52† A R H S No Gunshield.
+5cm PaK 38(g) QSU A4[3]3[4] QSU A3 53† E R H S B
+7.5cm PaK 97/38(g) QSU H5[3+] s6 QSU H5 s6 54† E R B
+7.5cm PaK 40(g) QSU A4[3]3[4] QSU A3 55† E R H S B
+Skoda M15 QSU QSU 56† A R H S C B
+Canon de 75 mle 1897 QSU s7 QSU s7 57 R B
+Skoda M29 AP6 AP6 58† A R S
+Skoda M17 QSU QSU 59† A R S C
+Skoda M28(80) 60† S C
+Skoda M14/19 s8 s8 61† A† R H S C
+leFH 18(g) H4[3+] s5 H4 s5 62† E H S B
+Skoda M35 AP7 C7[CS]† AP7 63† R S C
+G obr. 10/30 h-d s7 h-d s7 64† R B
+G obr. 38 s5[1-2R]† 65 R B
+Skoda M14 66† R H S
+Skoda M15/16 s6 s6 67† S C No IF.
+C mle 17 S s7 s7 68† R B
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR† 2 TK DR† 69† T†1 R B
+Oerlikon FF LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 70 G† R H S C B
+2cm FlaK 30(g) LF [NT, 20†[1], 2 ROF, B9] LF [NT, 20†[1], 2 ROF, B9] 71† E G†1 R B
+2cm FlaK 38(g) LF [NT, 20†[1], 2 ROF, B10] LF [NT, 20†[1], 2 ROF, B10] 72† E G†1 R B
+3.7cm FlaK 36(g) 73† E R B
+Bofors 40mm LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 74† G†1 R H S C
+Skoda M33 75R S
+8.8cm FlaK 18 o. 36(g) LF [88†[1], 1 ROF, B11] LF [88†[1], 1 ROF, B11] 76† E G†1 R S B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
index f103077..f1543b6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1940 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
index 8676a18..b1ad19f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1941 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
index d060ccc..3d072e5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1942 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
index 3f2df78..6c7a84b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1943 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
index be73b13..46cc953 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1944 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
index 0196874..77c8bfe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
@@ -1,14 +1,14 @@
=== ordnance/belgian/1945 ===
-Name Capabilities (effective) # Notes Comments
------------- ------------------- ------------------- --- ------- ----------
-DBT 3PP 3PP 6† A B D †
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-M76 A NT h-d LF† [INF] NT h-d LF† [INF] 7† A B D
-7.6cm FRC NT QSU NT QSU 8† A B †
-C47 FRC M 32 NT QSU NT QSU 9 B
-C75 TR NT QSU h-d s5 NT QSU h-d s5 10 B
-C75 GP NT LF [75*, B10] s5 NT LF [75*, B10] s5 11 B
-Ob 105 GP NT LF [105*] s5 NT LF [105*] s5 12 B
-C120 M31 NT LF [120*] NT LF [120*] 13 B
-M27 FRC NM ST NM ST 14 B
+Name Capabilities (effective) # Notes Comments
+------------ ---------------- ---------------- --- ------- ----------
+DBT 3PP 3PP 6† A B D †
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+M76 A h-d LF† [INF] h-d LF† [INF] 7† A B D
+7.6cm FRC QSU QSU 8† A B †
+C47 FRC M 32 QSU QSU 9 B
+C75 TR QSU h-d s5 QSU h-d s5 10 B
+C75 GP LF [75*, B10] s5 LF [75*, B10] s5 11 B
+Ob 105 GP LF [105*] s5 LF [105*] s5 12 B
+C120 M31 LF [120*] LF [120*] 13 B
+M27 FRC NM NM 14 B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
index 0ae60a3..def3715 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU WP7 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
index 6e20f41..acdf6df 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU WP7 s8† 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU WP7 s8† 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
index 1ae5eec..e01eb2a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU IR†[1] WP7 s8† 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
index 1ca385f..309f2fe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU IR†[1] WP7 s8† 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
index aedfc37..8ffab08 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU HE8† 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU IR†[1] WP7 s8† 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU HE8† 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
index 6229ea0..ea86e4f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
@@ -1,29 +1,29 @@
=== ordnance/british/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------------- ----------------------------- --- -------------------- ---------------
-OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
-OML 3-in. Mortar NT QSU IR[2+]†[1] WP7 s8[1+]† NT QSU IR†[1] WP7 s8† 2† A†1 D N P
-OSB 4.2-in. Mortar NT WP7 s8 NT WP7 s8 3† N P Towed†
-OQF 25mm Hotchkiss NT QSU NT QSU 4† B N
-OQF 2-Pounder T LF [NT, 40†[1], 2 ROF, B11] T LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
-OQF 6-Pounder 7-cwt NT QSU D6[J4E]7[5]† HE7[F3]8[4+]† NT QSU D7† HE8† 6† B N P
-OQF 17/25-Pounder NT NT 7 N
-OQF 17-Pounder NT D5[S4]6[5]† HE8[J4+]† NT D6† HE8† 8† n/a
-OQF M1A1 75mm Pack Howitzer NT QSU H6 WP7 NT QSU H6 WP7 9† D P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 10† B N
-OQF 18-Pounder NT QSU WP7 s8 NT QSU WP7 s8 11† N P
-OQF 25-Pounder Short NT QSU s8 NT QSU s8 12 D P
-OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 ST LF [NT, 0 ROF] s8 ST 13† N P
-OQF 3.7-in. Howitzer NT QSU H6[3+P]† WP7 s8 NT QSU WP7 s8 14† D N P
-OQF 4.5-in. Howitzer NT WP7 s8 NT WP7 s8 15† N P
-OBL 4.5-in. Gun NT NT 16† N
-OBL 5.5-in. Gun-Howitzer NT NT 16† N P
-OBL 6-in. Howitzer NT NT 17† N P
-OBL 7.2-in. Howitzer Mk I NT NT 18† N P No IF. Acq. NA†
-OBL 7.2-in. Howitzer Mk VI NT RFNM NT RFNM 19† P No IF.
-OQF 20mm AA T T 20 n/a
-OQF 40mm AA T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 21† C†1 N P
-OQF 3-in. 20-cwt AA T T 22† E P
-OQF 3.7-in. AA T T 23† E N P
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ --------------------------- --- -------------------- ---------------
+OML 2-in. Mortar 4PP IR[2+]† s7 4PP IR† s7 1 A† N P
+OML 2-in. Airborne Mortar IR s7 3PP IR s7 3PP 1 n/a
+OML 3-in. Mortar QSU IR[2+]†[1] WP7 s8[1+]† QSU IR†[1] WP7 s8† 2† A†1 D N P
+OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed†
+OQF 25mm Hotchkiss QSU QSU 4† B N
+OQF 2-Pounder LF [NT, 40†[1], 2 ROF, B11] LF [NT, 40†[1], 2 ROF, B11] 5† B C†1 N P
+OQF 6-Pounder 7-cwt QSU D6[J4E]7[5]† HE7[F3]8[4+]† QSU D7† HE8† 6† B N P
+OQF 17/25-Pounder 7 N
+OQF 17-Pounder D5[S4]6[5]† HE8[J4+]† D6† HE8† 8† n/a
+OQF M1A1 75mm Pack Howitzer QSU H6 WP7 QSU H6 WP7 9† D P
+Canon de 75 mle 1897 QSU s8 QSU s8 10† B N
+OQF 18-Pounder QSU WP7 s8 QSU WP7 s8 11† N P
+OQF 25-Pounder Short QSU s8 QSU s8 12 D P
+OQF 25-Pounder Gun-Howitzer LF [NT, 0 ROF] s8 LF [NT, 0 ROF] s8 13† N P
+OQF 3.7-in. Howitzer QSU H6[3+P]† WP7 s8 QSU WP7 s8 14† D N P
+OQF 4.5-in. Howitzer WP7 s8 WP7 s8 15† N P
+OBL 4.5-in. Gun 16† N
+OBL 5.5-in. Gun-Howitzer 16† N P
+OBL 6-in. Howitzer 17† N P
+OBL 7.2-in. Howitzer Mk I 18† N P No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI RFNM RFNM 19† P No IF.
+OQF 20mm AA 20 n/a
+OQF 40mm AA LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 21† C†1 N P
+OQF 3-in. 20-cwt AA 22† E P
+OQF 3.7-in. AA 23† E N P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
index 80cc592..fd28135 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
index 2c39160..f0eed7c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
index fba6cb6..ab851c2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
index d9908b0..13205c1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
index dc536c7..f3c1c21 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
index 5e4705c..5b937b0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
@@ -1,12 +1,12 @@
=== ordnance/bulgarian/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------- ------------------- --- -------------- -------------
-LG de 50 mle 37 2PP 2PP 37 A
-Madsen M-35 NT QSU R2 IFE=B10† NT QSU R2 IFE=B10† 38† T†1 No Gunshield.
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Skoda Infantry Gun NT QSU h-d NT QSU h-d 39† n/a
-Bofors 75mm M36 NT QSU h-d NT QSU h-d 40† A
-75mm K-S NT QSU h-d s5 NT QSU h-d s5 41† n/a
-Ob 105mm GP NT LF [105*†[1]] s5 NT LF [105*†[1]] s5 42† G†1
-D/30 Krupp NT RFNM NT RFNM 43 n/a No IF.
+Name Capabilities (effective) # Notes Comments
+------------------ ---------------- ---------------- --- -------------- -------------
+LG de 50 mle 37 2PP 2PP 37 A
+Madsen M-35 QSU R2 IFE=B10† QSU R2 IFE=B10† 38† T†1 No Gunshield.
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Skoda Infantry Gun QSU h-d QSU h-d 39† n/a
+Bofors 75mm M36 QSU h-d QSU h-d 40† A
+75mm K-S QSU h-d s5 QSU h-d s5 41† n/a
+Ob 105mm GP LF [105*†[1]] s5 LF [105*†[1]] s5 42† G†1
+D/30 Krupp RFNM RFNM 43 n/a No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
index 6decc6d..1fe69af 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
index 7720b74..0983896 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
index 0ea092a..7172684 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
index 1340fcd..970e853 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
index 9b7378f..51b8a4f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
index ff8d7f5..58d8b37 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
index 7095aa6..5a4508f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
index 8e34018..c6df3a3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
index 2aef635..c9044e0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
index 5c70d0f..74cddb6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
index 375da5c..666fcd2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
index 694a031..ebd9416 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
@@ -1,40 +1,40 @@
=== ordnance/chinese~gmd/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------------------- ------------------------------ ------------------------------ ------ -------------------------- ------------------
-Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
-Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
-5cm leGrW 36 5PP 5PP 2 A
-50mm RM obr. 38 5PP 5PP 2 A
-Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
-M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
-Stokes 3-in. NT QSU NT QSU 4 A E†
-8cm GrW 34 NT QSU IR s6 NT QSU IR s6 4 A E†
-82mm BM obr. 37 NT QSU IR s6 NT QSU IR s6 4 A E†
-M1 81mm NT QSU WP7 NT QSU WP7 5 A B
-M2 4.2-in. NT QSU WP9 NT QSU WP9 5† B
-3.7cm PaK 35/36 NT QSU NT QSU 6 E†
-M3A1 37mm NT QSU C7†[1] NT QSU C7†[1] 6† C†1
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 7† B Low Ammo†
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B Acq. NA† Low Ammo†
-7.5cm Krupp M08 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A F†
-Obice da 75/13 NT QSU h-d NT QSU h-d 8 A D† F†1
-7.5cm leIG 18 NT QSU h-d NT QSU h-d 9† n/a
-76.2mm PP obr. 27 NT QSU AP6 s6 NT QSU AP6 s6 9†[1] D†
-M1A1 75mm Pack Howitzer NT QSU h-d C5†[1] WP7 NT QSU h-d C5†[1] WP7 10† A C†1
-7.7cm FK 16 NT QSU h-d AP6 s5 NT QSU h-d AP6 s5 11 F†
-76.2mm P obr. 02/30 NT QSU h-d AP6 s6 NT QSU h-d AP6 s6 11 D† F†1
-OQF 18-Pounder NT QSU h-d AP6 WP5 s6 NT QSU h-d AP6 WP5 s6 11 B
-10.5cm leFH 16 NT h-d s6 NT h-d s6 12† A
-Cannone da 105/28 NT AP5 s6 NT AP5 s6 12 F†
-M2A1 105mm Howitzer NT C5† WP7 s6 NT C5† WP7 s6 12 B C†
-122mm G obr. 10/30 NT h-d s6 NT h-d s6 13 B D†
-122mm G obr. 38 NT s6 NT s6 13 B D†
-Obice da 149/13 NT h-d[C]† WP6[B]† s5 NT h-d[C]† s5 14† n/a
-Oerlikon FF T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-Cannone-mitragliera da 20/65 T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
-2cm FlaK 30 T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 15†[1] G†
-3.7cm FlaK 36 o. 37 T AP6 T AP6 16 B
-Bofors 40mm L/60 T AP6 LF [40†[1], 2 ROF] T AP6 LF [40†[1], 2 ROF] 16† G†1
-Bofors 75mm M29 T AP6 LF [75†[1], 1 ROF, B10†] T AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
-8.8cm FlaK 18 T AP6 LF [88†[1], 1 ROF, B10†] T AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
+Name Capabilities (effective) # Notes Comments
+------------------------------ ---------------------------- ---------------------------- ------ -------------------------- ------------------
+Type 27 Grenade Launcher 2PP 2PP 1† A Air Bursts NA†
+Mortaio da 45 "Brixia" 4PP 4PP 2 A D†
+5cm leGrW 36 5PP 5PP 2 A
+50mm RM obr. 38 5PP 5PP 2 A
+Type 89 Heavy Grenade Launcher IR WP5 s5 4PP IR WP5 s5 4PP 2† A
+M2 60mm IR 5PP OBA† IR 5PP OBA† 3† A
+Stokes 3-in. QSU QSU 4 A E†
+8cm GrW 34 QSU IR s6 QSU IR s6 4 A E†
+82mm BM obr. 37 QSU IR s6 QSU IR s6 4 A E†
+M1 81mm QSU WP7 QSU WP7 5 A B
+M2 4.2-in. QSU WP9 QSU WP9 5† B
+3.7cm PaK 35/36 QSU QSU 6 E†
+M3A1 37mm QSU C7†[1] QSU C7†[1] 6† C†1
+37mm PP obr. 15R QSU h-d QSU h-d 7† B Low Ammo†
+Cannone da 70/15 QSU h-d QSU h-d 7† A B Acq. NA† Low Ammo†
+7.5cm Krupp M08 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A F†
+Obice da 75/13 QSU h-d QSU h-d 8 A D† F†1
+7.5cm leIG 18 QSU h-d QSU h-d 9† n/a
+76.2mm PP obr. 27 QSU AP6 s6 QSU AP6 s6 9†[1] D†
+M1A1 75mm Pack Howitzer QSU h-d C5†[1] WP7 QSU h-d C5†[1] WP7 10† A C†1
+7.7cm FK 16 QSU h-d AP6 s5 QSU h-d AP6 s5 11 F†
+76.2mm P obr. 02/30 QSU h-d AP6 s6 QSU h-d AP6 s6 11 D† F†1
+OQF 18-Pounder QSU h-d AP6 WP5 s6 QSU h-d AP6 WP5 s6 11 B
+10.5cm leFH 16 h-d s6 h-d s6 12† A
+Cannone da 105/28 AP5 s6 AP5 s6 12 F†
+M2A1 105mm Howitzer C5† WP7 s6 C5† WP7 s6 12 B C†
+122mm G obr. 10/30 h-d s6 h-d s6 13 B D†
+122mm G obr. 38 s6 s6 13 B D†
+Obice da 149/13 h-d[C]† WP6[B]† s5 h-d[C]† s5 14† n/a
+Oerlikon FF LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+Cannone-mitragliera da 20/65 LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 15†[2] D† G†1
+2cm FlaK 30 LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 15†[1] G†
+3.7cm FlaK 36 o. 37 AP6 AP6 16 B
+Bofors 40mm L/60 AP6 LF [40†[1], 2 ROF] AP6 LF [40†[1], 2 ROF] 16† G†1
+Bofors 75mm M29 AP6 LF [75†[1], 1 ROF, B10†] AP6 LF [75†[1], 1 ROF, B10†] 17 B D† G†1
+8.8cm FlaK 18 AP6 LF [88†[1], 1 ROF, B10†] AP6 LF [88†[1], 1 ROF, B10†] 17 B D† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
index b468052..4b3cfff 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
index 40d1013..6caae2e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
index e6ec25c..fcea43a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
index 763e134..82fb80e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
index 9715300..90b1897 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
index a01c6d6..c799a33 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
@@ -2,5 +2,5 @@
Name Capabilities (effective) # Notes Comments
---------------- -------------- ------------- --- ------- -------------
-Canonne da 65/17 NT NT 35 A No Gunshield.
-Skoda M28(FE) NT NT 36 A
+Canonne da 65/17 35 A No Gunshield.
+Skoda M28(FE) 36 A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
index 260d530..708f117 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
index 71a191c..7c545ee 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
index 9b65a27..747ed8f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
index 361a3b7..5fc4bb3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
index f3cd9ec..b99f3da 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
index 0158eb3..5406a14 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
@@ -1,5 +1,5 @@
=== ordnance/danish/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------------ --------------------- --------------------- --- ----------------- ----------
-Machinecannon 20mm M-35 NT QSU†[1] R2 IFE=B10 NT QSU†[1] R2 IFE=B10 19† De T†1
+Name Capabilities (effective) # Notes Comments
+----------------------- ------------------ ------------------ --- ----------------- ----------
+Machinecannon 20mm M-35 QSU†[1] R2 IFE=B10 QSU†[1] R2 IFE=B10 19† De T†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
index 64a0610..7ee1e84 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
index dfea359..5c60b43 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
index 43e099a..8101f34 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
index 87caf17..98e56d5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
index d9c9b5b..2f8576a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
index 46055a4..22d29e6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
@@ -1,10 +1,10 @@
=== ordnance/dutch/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------------- -------------------------------- -------------------------------- --- ------- ----------
-Solothurn s/18-1100 5PP 5PP 15 A Ne
-Brandt 47mm Mortar 1 n/a
-Krupp 75mm M1933 Field Gun NT QSU C4† NT QSU C4† 2 US C†
-Bofors 105mm M1924 Howitzer T LF [NT, B11] T LF [NT, B11] 3 n/a
-20mm Rheinmetall AA T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 4 Gr C†
-Bofors 80mm M29/38 T LF [80†, 1 ROF, B11] AP TK# 17 T LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
+Name Capabilities (effective) # Notes Comments
+--------------------------- ------------------------------ ------------------------------ --- ------- ----------
+Solothurn s/18-1100 5PP 5PP 15 A Ne
+Brandt 47mm Mortar 1 n/a
+Krupp 75mm M1933 Field Gun QSU C4† QSU C4† 2 US C†
+Bofors 105mm M1924 Howitzer LF [NT, B11] LF [NT, B11] 3 n/a
+20mm Rheinmetall AA LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 4 Gr C†
+Bofors 80mm M29/38 LF [80†, 1 ROF, B11] AP TK# 17 LF [80†, 1 ROF, B11] AP TK# 17 6 AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
index 7c2d7a2..42f9bf8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1940 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
index 6e976ca..56a9506 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1941 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU HE† 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU HE† 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
index 65c21f2..bdcf66d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1942 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU s8† 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU HE† 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU s8† 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU HE† 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
index 9b426b1..ef311d3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1943 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU IR† s8† 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU HE† 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU H6[9]† 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU IR† s8† 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU HE† 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU H6[9]† 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
index 55e2fe4..1e74af4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1944 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU IR† s8† 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU HE† 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU H6[9]† 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT H4 WP6 s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d WP6 s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU IR† s8† 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU HE† 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU H6[9]† 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 H4 WP6 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d WP6 s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
index 6d51354..43e31d4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
@@ -1,43 +1,43 @@
=== ordnance/finnish/1945 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ------------------------------------------------------------- ------------------------------------------------------------- --- ------------------ ---------------------------
-47 Krh/41 2PP 2PP 1 A
-50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
-81 Krh/32 NT QSU IR[3+]† s8[N1]† 5PP dm NT QSU IR† s8† 5PP dm 3† A
-81 Savunheitin M/42 NT QSU s† 4PP dm NT QSU s† 4PP dm 4† A
-120 Krh/40 NT QSU NT QSU 5† n/a
-Boys ATR(b) 1PP 1PP 6† n/a "British"†
-Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
-20 PstK/40 NT QSU R2 IFE=B10 NT QSU R2 IFE=B10 8† C†1 Towing NA†1
-25 PstK/37(f) NT QSU NT QSU 9† B D
-37 PstK/36(s) NT QSU HE[1+]† NT QSU HE† 10† A B
-37 PstK/37(g) NT QSU H6[9][3+]† NT QSU H6[9]† 11† B D
-45 PstK/32(r) NT QSU NT QSU 12† B
-50 PstK/38(g) NT QSU A4 NT QSU A4 13 B
-75 PstK/97-38(g) NT QSU H8 H=B12 NT QSU H8 H=B12 14† B
-75 PstK/40(g) NT QSU A3 H4 s7 NT QSU A3 H4 s7 15 B
-76 RK/27(r) NT QSU H6[J4+]† s6 NT QSU H6† s6 16† A B
-75 K/02 NT QSU s6 NT QSU s6 17† n/a
-76 LK/13 NT QSU s6 NT QSU s6 18 n/a
-76 K/02(r) NT QSU h-d s6 NT QSU h-d s6 19† B
-76 K/36(r) NT QSU s6 NT QSU s6 20† B E†1
-87 K/95 NT QSU h-d NT QSU h-d 21 F† No IF. Acq. NA†
-90 K/77 NT QSU h-d NT QSU h-d 22† F†1 No IF. Acq. NA†1
-105 H/33(g) NT h-d H6[A4+]† s8 NT h-d H6† s8 23† B
-105 H/37 NT s6 NT s6 24† n/a
-105 H/41(t) NT H6[A4+]† s8 NT H6† s8 25† B
-107 K 10/13 NT s5 NT s5 26† n/a
-107 K/77(r) NT h-d NT h-d 27† B F†1 No IF. Acq. NA†1
-114 H/18(b) NT H4[4+] WP6[4+] s8 NT H4 WP6 s8 28† n/a
-122 H/10(r) NT h-d WP6[4+] s6 NT h-d WP6 s6 29† B
-150 H/40(g) NT NM H6 s8 NT NM H6 s8 30 B
-155 H/17(f) NT s6 NT s6 31 B
-7.62 ItKK/31-40 T QSU 2 TK DR† T QSU 2 TK DR† 32† C†1 Towing NA†1
-20 ItK/30 BSW(g) T LF [NT, 20†, 2 ROF, B10] T LF [NT, 20†, 2 ROF, B10] 33 B G†
-20 ItK/38 BSW(g) T LF [NT, 20†[1], 2 ROF, B11] T LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
-20 ItK/35 Br T LF [NT, 20†[1], 2 ROF] T LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
-20 ItK/40 VKT T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
-40 ItK/35-39 B(s) T LF [40†[1], 2 ROF] T LF [40†[1], 2 ROF] 37† B G†1
-76 ItK/28 B(s) T LF [NT, 76†, 1 ROF] T LF [NT, 76†, 1 ROF] 38 B G†
-76 ItK/31(r) T T 39 B E†
+Name Capabilities (effective) # Notes Comments
+------------------- ----------------------------------------------------------- ----------------------------------------------------------- --- ------------------ ---------------------------
+47 Krh/41 2PP 2PP 1 A
+50 Krh/39(r) 4PP B12[3+]† 4PP B12† 2† A B
+81 Krh/32 QSU IR[3+]† s8[N1]† 5PP dm QSU IR† s8† 5PP dm 3† A
+81 Savunheitin M/42 QSU s† 4PP dm QSU s† 4PP dm 4† A
+120 Krh/40 QSU QSU 5† n/a
+Boys ATR(b) 1PP 1PP 6† n/a "British"†
+Lahti ATR 4PP B30.35† 4PP B30.35† 7† A Light AA fire in 44+†
+20 PstK/40 QSU R2 IFE=B10 QSU R2 IFE=B10 8† C†1 Towing NA†1
+25 PstK/37(f) QSU QSU 9† B D
+37 PstK/36(s) QSU HE[1+]† QSU HE† 10† A B
+37 PstK/37(g) QSU H6[9][3+]† QSU H6[9]† 11† B D
+45 PstK/32(r) QSU QSU 12† B
+50 PstK/38(g) QSU A4 QSU A4 13 B
+75 PstK/97-38(g) QSU H8 H=B12 QSU H8 H=B12 14† B
+75 PstK/40(g) QSU A3 H4 s7 QSU A3 H4 s7 15 B
+76 RK/27(r) QSU H6[J4+]† s6 QSU H6† s6 16† A B
+75 K/02 QSU s6 QSU s6 17† n/a
+76 LK/13 QSU s6 QSU s6 18 n/a
+76 K/02(r) QSU h-d s6 QSU h-d s6 19† B
+76 K/36(r) QSU s6 QSU s6 20† B E†1
+87 K/95 QSU h-d QSU h-d 21 F† No IF. Acq. NA†
+90 K/77 QSU h-d QSU h-d 22† F†1 No IF. Acq. NA†1
+105 H/33(g) h-d H6[A4+]† s8 h-d H6† s8 23† B
+105 H/37 s6 s6 24† n/a
+105 H/41(t) H6[A4+]† s8 H6† s8 25† B
+107 K 10/13 s5 s5 26† n/a
+107 K/77(r) h-d h-d 27† B F†1 No IF. Acq. NA†1
+114 H/18(b) H4[4+] WP6[4+] s8 H4 WP6 s8 28† n/a
+122 H/10(r) h-d WP6[4+] s6 h-d WP6 s6 29† B
+150 H/40(g) NM H6 s8 NM H6 s8 30 B
+155 H/17(f) s6 s6 31 B
+7.62 ItKK/31-40 QSU 2 TK DR† QSU 2 TK DR† 32† C†1 Towing NA†1
+20 ItK/30 BSW(g) LF [NT, 20†, 2 ROF, B10] LF [NT, 20†, 2 ROF, B10] 33 B G†
+20 ItK/38 BSW(g) LF [NT, 20†[1], 2 ROF, B11] LF [NT, 20†[1], 2 ROF, B11] 34† B G†1
+20 ItK/35 Br LF [NT, 20†[1], 2 ROF] LF [NT, 20†[1], 2 ROF] 35† A D G†1 Road MP = 1†
+20 ItK/40 VKT LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk† 36† D G†1
+40 ItK/35-39 B(s) LF [40†[1], 2 ROF] LF [40†[1], 2 ROF] 37† B G†1
+76 ItK/28 B(s) LF [NT, 76†, 1 ROF] LF [NT, 76†, 1 ROF] 38 B G†
+76 ItK/31(r) 39 B E†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
index c1b6635..e532ee8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
index cd3fa50..0bf337d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
index 2ccc914..246a784 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
index fab1144..3aab36a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
index 73727de..43a8a52 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
index 07ab76b..786d2ed 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
@@ -1,25 +1,25 @@
=== ordnance/french/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------------- ------ -------- ----------------------
-LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
-Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
-Mortier de 81 mle 27/31 NT QSU s8 NT QSU s8 3† A B D V
-Fusil Antichar Boys 1PP 1PP 4† B
-Canon AC de 25 SA-L mle 34 NT QSU NT QSU 5† B P
-Canon AC de 47 SA mle 37 APX NT QSU APCR only†[1] NT QSU APCR only†[1] 6†[1] B G† P V
-Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 ST h-d HE7 LF [NT] s6 ST 7 E no shield
-Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
-Canon de 65 M mle 06 NT QSU h-d NT QSU h-d 9† A P No Gunshield.
-Canon de 75 M mle 28 NT QSU h-d AP5 s6 NT QSU h-d AP5 s6 10† A P
-Canon de 75 mle 1897 NT QSU s8 NT QSU s8 11† B P
-Canon de 105 M mle 28 NT h-d NT h-d 12† A P
-Canon de 105 C mle 35 B NT NT 13 E F†
-Canon de 105 L mle 13 S NT NT 14† P
-Canon de 105 L mle 36 S NT NT 15 E F†
-Canon de 155 C mle 17 S NT s8 NT s8 16† n/a
-Canon de 155 GPF NT RFNM NT RFNM 17† n/a No IF.
-Mitrailleuse de 13.2 CAJ mle 30 T 2 TK DR†[1] T 2 TK DR†[1] 18†[1] B G† V Towing NA†1
-Mitrailleuse de 20 CA mle 39 O T LF [NT, 20†, 2 ROF, B11] T LF [NT, 20†, 2 ROF, B11] 19† n/a
-Canon Automatique de 25 CA mle 38 T T 20†[1] G†
-Canon de 75 CA mle 32 T NM T NM 21† n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ------------------------ ------------------------ ------ -------- ----------------------
+LG de 50 mle 37(f) 2PP 2PP 1 A B C† E crewed†
+Mortier de 60 mle 35 5PP no OBA† IR[2+]† 5PP no OBA† IR† 2† A B V
+Mortier de 81 mle 27/31 QSU s8 QSU s8 3† A B D V
+Fusil Antichar Boys 1PP 1PP 4† B
+Canon AC de 25 SA-L mle 34 QSU QSU 5† B P
+Canon AC de 47 SA mle 37 APX QSU APCR only†[1] QSU APCR only†[1] 6†[1] B G† P V
+Canon de 75 AC mle 97/35 h-d HE7 LF [NT] s6 h-d HE7 LF [NT] s6 7 E no shield
+Canon de 37 mle 16 TR 5PP (3PP dm) 5PP (3PP dm) 8†[1] A C† crewed†
+Canon de 65 M mle 06 QSU h-d QSU h-d 9† A P No Gunshield.
+Canon de 75 M mle 28 QSU h-d AP5 s6 QSU h-d AP5 s6 10† A P
+Canon de 75 mle 1897 QSU s8 QSU s8 11† B P
+Canon de 105 M mle 28 h-d h-d 12† A P
+Canon de 105 C mle 35 B 13 E F†
+Canon de 105 L mle 13 S 14† P
+Canon de 105 L mle 36 S 15 E F†
+Canon de 155 C mle 17 S s8 s8 16† n/a
+Canon de 155 GPF RFNM RFNM 17† n/a No IF.
+Mitrailleuse de 13.2 CAJ mle 30 2 TK DR†[1] 2 TK DR†[1] 18†[1] B G† V Towing NA†1
+Mitrailleuse de 20 CA mle 39 O LF [NT, 20†, 2 ROF, B11] LF [NT, 20†, 2 ROF, B11] 19† n/a
+Canon Automatique de 25 CA mle 38 20†[1] G†
+Canon de 75 CA mle 32 NM NM 21† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
index b32f465..f2b1997 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1940.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
index b61be52..f6aa8d3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1941.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU A5 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU A4 H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU A5 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU A5 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
index 8df01ff..79707dd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1942.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A5 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A6 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A5 s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A5 s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A5 LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU A4 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU A5 H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU A6 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU A5 s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU A5 s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] A5 LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU A4 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
index e363d5a..8011851 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1943.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A4 s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A4 s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A4 LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU A4 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU A4 H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU A5 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU A4 s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU A4 s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] A4 LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU A4 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
index b8dd803..e617f02 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1944.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A3 s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A3 LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU A4 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU A3 H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU A4 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU A3 s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU A3 s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] A3 LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU A4 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
index f1743cb..1f63efe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/german/1945.txt
@@ -1,38 +1,38 @@
=== ordnance/german/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------------- ------------------------------------- ------------------------------------- --- ---------------- -------------------
-5cm leGrW 5PP 5PP 1 N
-8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
-10cm NbW 35 NT QSU s10 NT QSU s10 3 O
-12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
-2.8cm sPzB 41 NT QSU NT QSU 5† A† N P uses APCR TK Table†
-3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU NT QSU 7 A† NT uses APCR TK Table†
-5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 NT
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† NT
-7.62cm PaK 36r NT QSU A5[2]4[3]3[4] s6 NT QSU A3 s6 11† N
-8.8cm PaK 43 T LF [88†, 1 ROF, B11, M4, -1] T LF [88†, 1 ROF, B11, M4, -1] 12 C†
-8.8cm PaK 43/41 NT NT 13 n/a
-12.8cm K 81/1 NT NM NT NM 14 n/a
-7.5cm leIG 18 NT QSU H7 NT QSU H7 15 N O
-15cm sIG 33 NT H7 s8 NT H7 s8 16 N
-7.5cm LG 40 T QSU H6 T QSU H6 17 NT
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† NT
-7.5cm leFK 16nA NT QSU h-d H5 s8 NT QSU h-d H5 s8 19 n/a
-10.5cm leFH 18 NT H6 s8 NT H6 s8 20 N
-s 10cm K 18 NT NM H6 s8 NT NM H6 s8 21 N
-15cm sFH 18 NT NM H6 s8 NT NM H6 s8 22 N
-15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
-17cm K 18 NT RFNM AP6 NT RFNM AP6 24 N No IF.
-2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
-2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
-2cm FlaKvierling 38 T 4TK DR† T 4TK DR† 27† N
-3.7cm FlaK 36 o. 37 T H5[9]† T H5[9]† 28 B† N
-3.7cm FlaK 43 T T 29 n/a
-8.8cm FlaK 18 o. 36 T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] T A3 LF [88L†, 1 ROF, B11] 30 C† N
-2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
-4.7 cm PaK 36(t) NT QSU A5[1]4[2] NT QSU A4 2† n/a
-7.5 cm Geb G36 NT QSU H7† NT QSU H7† 3† Ge O
-10.5 cm Geb H40 NT QSU H8 NT QSU H8 4† Ge O
+Name Capabilities (effective) # Notes Comments
+------------------------ ----------------------------------- ----------------------------------- --- ---------------- -------------------
+5cm leGrW 5PP 5PP 1 N
+8cm GrW 34 QSU IR s8 QSU IR s8 2† N
+10cm NbW 35 QSU s10 QSU s10 3 O
+12cm GrW 42 QSU s8 QSU s8 4† n/a
+2.8cm sPzB 41 QSU QSU 5† A† N P uses APCR TK Table†
+3.7cm PaK 35/36 QSU A4[1]5[2]4[3]3[4] H6[9]† QSU A3 H6[9]† 6 B† N P
+4.2cm lePaK 41 QSU QSU 7 A† NT uses APCR TK Table†
+5cm PaK 38 QSU A5[1]6[2]5[3]4[4] QSU A4 8† N
+7.5cm PaK 97/38 QSU H6 s7 QSU H6 s7 9 NT
+7.5cm PaK 40 QSU A5[2]4[3]3[4] s7 QSU A3 s7 10† NT
+7.62cm PaK 36r QSU A5[2]4[3]3[4] s6 QSU A3 s6 11† N
+8.8cm PaK 43 LF [88†, 1 ROF, B11, M4, -1] LF [88†, 1 ROF, B11, M4, -1] 12 C†
+8.8cm PaK 43/41 13 n/a
+12.8cm K 81/1 NM NM 14 n/a
+7.5cm leIG 18 QSU H7 QSU H7 15 N O
+15cm sIG 33 H7 s8 H7 s8 16 N
+7.5cm LG 40 QSU H6 QSU H6 17 NT
+10.5cm LG 42 QSU H6 s6 QSU H6 s6 18† NT
+7.5cm leFK 16nA QSU h-d H5 s8 QSU h-d H5 s8 19 n/a
+10.5cm leFH 18 H6 s8 H6 s8 20 N
+s 10cm K 18 NM H6 s8 NM H6 s8 21 N
+15cm sFH 18 NM H6 s8 NM H6 s8 22 N
+15cm K 18 RFNM AP6 RFNM AP6 23 NT
+17cm K 18 RFNM AP6 RFNM AP6 24 N No IF.
+2cm FlaK 30 LF [20†, 2 ROF, B10, NT] LF [20†, 2 ROF, B10, NT] 25 C† N
+2cm FlaK 38 LF [20†, 2 ROF, B11, NT] LF [20†, 2 ROF, B11, NT] 26 C† N
+2cm FlaKvierling 38 4TK DR† 4TK DR† 27† N
+3.7cm FlaK 36 o. 37 H5[9]† H5[9]† 28 B† N
+3.7cm FlaK 43 29 n/a
+8.8cm FlaK 18 o. 36 A5[2]4[3]3[4] LF [88L†, 1 ROF, B11] A3 LF [88L†, 1 ROF, B11] 30 C† N
+2cm Tankbüsche S-18 5PP 5PP 1† AxM A No Long Range
+4.7 cm PaK 36(t) QSU A5[1]4[2] QSU A4 2† n/a
+7.5 cm Geb G36 QSU H7† QSU H7† 3† Ge O
+10.5 cm Geb H40 QSU H8 QSU H8 4† Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
index e945914..70885d2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
index 6e803dc..d61a5ca 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
index 2d5c59d..c8e48c9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
index 5c256bc..136dc1b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
index a438005..3c1c241 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
index 9a505d4..045136c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
--------------- -------------- ------------- --- ------- ----------
-Vari 85/24 M NT s5 NT s5 16 Gr
-OR 105/19 NT h-d NT h-d 17 Gr
-3.7cm Bofors AA T T 18 Gr
+Vari 85/24 M s5 s5 16 Gr
+OR 105/19 h-d h-d 17 Gr
+3.7cm Bofors AA 18 Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
index adee1b5..ffb68eb 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1940 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
index 1a11033..768459e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1941 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
index ce0f1e9..0fc391f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1942 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
index 525e23e..273c489 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1943 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
index 90b4245..96afba6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1944 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
index e13de55..a291ae4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
@@ -1,9 +1,9 @@
=== ordnance/hungarian/1945 ===
-Name Capabilities (effective) # Notes Comments
------------------- ------------------------- ------------------------- --- -------------- ----------
-5cm leGrW 39(h) 5PP 5PP 23 A
-40mm MAVAG 40 M NT QSU H7[9]† NT QSU H7[9]† 24† n/a
-Skoda M05/08 NT NT 25 A
-105mm MAVAG M40 NT h-d NT h-d 26 n/a
-Bofors 80mm M29/38 T LF [80†[1], 1 ROF, B11] T LF [80†[1], 1 ROF, B11] 27† G†1
+Name Capabilities (effective) # Notes Comments
+------------------ ----------------------- ----------------------- --- -------------- ----------
+5cm leGrW 39(h) 5PP 5PP 23 A
+40mm MAVAG 40 M QSU H7[9]† QSU H7[9]† 24† n/a
+Skoda M05/08 25 A
+105mm MAVAG M40 h-d h-d 26 n/a
+Bofors 80mm M29/38 LF [80†[1], 1 ROF, B11] LF [80†[1], 1 ROF, B11] 27† G†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
index 8f22907..f8e09a7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
index 82e1e63..8a5591c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
index b79e75a..e8dccfa 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
index 9c4bc71..b6ab9cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
index fb75e3b..d5734e8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- -------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
index 7bcf98d..d58154b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
@@ -1,10 +1,10 @@
=== ordnance/indonesian/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------------------- -------------------------- ----------------------- --- ------- ----------
-Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP S6 WP5 4PP 1 n/a
-Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
-Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 4 Jp A
-Type 1 Machine-Moved Gun NT QSU NT QSU 5 n/a
-Year-38 Type Field Gun (Improved) WP5[5] NT QSU h-d AP TK#12 WP5 NT QSU h-d AP TK#12 6 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------------------- ----------------------- -------------------- --- ------- ----------
+Type 89 Heavy Grenade Launcher S6[5] WP5[5] 4PP S6 WP5 4PP 1 n/a
+Type 97 Automatic Gun Long Range is NA 5PP Long Range is NA 5PP 2 Jp A
+Year-11 Flat-Trajectory INF Gun 5PP (3PP dm) 5PP (3PP dm) 3 Jp A
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 4 Jp A
+Type 1 Machine-Moved Gun QSU QSU 5 n/a
+Year-38 Type Field Gun (Improved) WP5[5] QSU h-d AP TK#12 WP5 QSU h-d AP TK#12 6 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
index 1975351..0bff188 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1940 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
index 985044b..0eb2e48 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1941 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
index 5562887..0d5a6a8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1942 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU Towed† 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU Towed† 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
index f17a45b..9b4a6ff 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1943 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU Towed† 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT H6†[1] 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU Towed† 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] H6†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU H6†[1] 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] H6†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
index 19c3a55..62e941d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1944 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU Towed† 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT H6†[1] 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU Towed† 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] H6†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU H6†[1] 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] H6†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
index 3a9dcae..be74df7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
@@ -1,24 +1,24 @@
=== ordnance/italian/1945 ===
-Name Capabilities (effective) # Notes Comments
----------------------------- --------------------- --------------------- --- ------------------------- ----------------------------------
-Mortaio da 45 "Brixia" 4PP 4PP 1 N
-Mortaio da 81/14 NT QSU IR s8 NT QSU IR s8 2† N
-Fucile-cc S 5PP 5PP 3 N
-Cannone-cc da 37/45 NT QSU NT QSU 4† C N R
-Cannone da 47/32 NT QSU Towed[A1+]† NT QSU Towed† 5† A C N No Gunshield.
-Cannone da 65/17 NT H6[S2+]†[1] NT H6†[1] 6† A C H†1 N No Gunshield.
-Cannone da 70/15 NT QSU h-d NT QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
-Obice da 75/13 NT QSU NT QSU 8† A
-Cannone da 75/27 NT QSU H6[S2+]†[1] NT QSU H6†[1] 9† A C H†1 N
-Obice da 75/18 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 10† A H†1 N
-Cannone da 75/32 NT QSU H6[S2+]†[1] s8 NT QSU H6†[1] s8 11† H†1
-Obice da 100/17 NT H6[S2+]†[1] NT H6†[1] 12† A H†1 N
-Cannone da 105/28 NT s8 NT s8 13† N
-Obice 149/13 NT NT 14† N
-Cannone da 149/35 NT RFNM s8 NT RFNM s8 15† B†1 N R No IF. Acq. NA†1
-Cannone da 149/40 NT RFNM NT RFNM 16† N
-Cannone-mitragliera da 20/65 T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 17† A C N
-Cannone-aa da 75/39 T "16" AP TK#† T "16" AP TK#† 18† n/a
-Cannone-aa da 75/46 T T 19† N
-Cannone-aa da 90/53 T T 20† N R
+Name Capabilities (effective) # Notes Comments
+---------------------------- ------------------- ------------------- --- ------------------------- ----------------------------------
+Mortaio da 45 "Brixia" 4PP 4PP 1 N
+Mortaio da 81/14 QSU IR s8 QSU IR s8 2† N
+Fucile-cc S 5PP 5PP 3 N
+Cannone-cc da 37/45 QSU QSU 4† C N R
+Cannone da 47/32 QSU Towed[A1+]† QSU Towed† 5† A C N No Gunshield.
+Cannone da 65/17 H6[S2+]†[1] H6†[1] 6† A C H†1 N No Gunshield.
+Cannone da 70/15 QSU h-d QSU h-d 7† A B†1 R Acq. NA†1 No Gunshield.
+Obice da 75/13 QSU QSU 8† A
+Cannone da 75/27 QSU H6[S2+]†[1] QSU H6†[1] 9† A C H†1 N
+Obice da 75/18 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 10† A H†1 N
+Cannone da 75/32 QSU H6[S2+]†[1] s8 QSU H6†[1] s8 11† H†1
+Obice da 100/17 H6[S2+]†[1] H6†[1] 12† A H†1 N
+Cannone da 105/28 s8 s8 13† N
+Obice 149/13 14† N
+Cannone da 149/35 RFNM s8 RFNM s8 15† B†1 N R No IF. Acq. NA†1
+Cannone da 149/40 RFNM RFNM 16† N
+Cannone-mitragliera da 20/65 LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 17† A C N
+Cannone-aa da 75/39 "16" AP TK#† "16" AP TK#† 18† n/a
+Cannone-aa da 75/46 19† N
+Cannone-aa da 90/53 20† N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
index 935d48e..98ee5be 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
index 2f754cf..da08403 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
index f566aba..0588f1f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
index 3422aee..c6e15c4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
index d99d166..b1f05f1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d H6† WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d H6† WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
index 6755216..36da1c6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
@@ -3,33 +3,33 @@
Name Capabilities (effective) # Notes Comments
---------------------------------------------------- ------------------------------------------ ------------------------------------------ ------ ------------------ ----------------------
Type 89 Heavy Grenade Launcher IR WP6† 4PP s7† IR WP6† 4PP s7† 1† n/a
-Year-11 Type Curved-Fire Infantry Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 2† A B†1
-Type 97 Curved-Fire Infantry Gun NT QSU WP5 NT QSU WP5 3† A
-Type 97 Light Close-Attack Gun NT QSU 5PP dm†[1] WP5 NT QSU 5PP dm†[1] WP5 4† A B†1
-Type 97 Medium Close-Attack Gun NT NT 5† A C†1 Towing NA†1
+Year-11 Type Curved-Fire Infantry Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 2† A B†1
+Type 97 Curved-Fire Infantry Gun QSU WP5 QSU WP5 3† A
+Type 97 Light Close-Attack Gun QSU 5PP dm†[1] WP5 QSU 5PP dm†[1] WP5 4† A B†1
+Type 97 Medium Close-Attack Gun 5† A C†1 Towing NA†1
Type 97 Automatic Gun 5PP 5PP 6† A crew†
-Type 94 Rapid-Fire Gun NT QSU h-d NT QSU h-d 7† A
-Type 1 Machine-Moved Gun NT QSU NT QSU 8† n/a
+Type 94 Rapid-Fire Gun QSU h-d QSU h-d 7† A
+Type 1 Machine-Moved Gun QSU QSU 8† n/a
Year-11 Type Flat-Trajectory Infantry Gun 5PP (3PP dm) 5PP (3PP dm) 9† A crewed†
-Type 92 Infantry Gun NT QSU h-d AP5 H6[5] WP5 NT QSU h-d AP5 H6 WP5 10† A
-Year-41 Type Mountain Gun NT QSU h-d H6[4+]† WP7 NT QSU h-d H6† WP7 11† A
-Year-38 Type Field Gun (Improved) NT QSU h-d WP6 "12" AP TK#† NT QSU h-d WP6 "12" AP TK#† 12† n/a
-Type 90 Field Gun NT QSU WP6 NT QSU WP6 13† n/a
-Type 91 10cm Field Howitzer NT NT 14† n/a
-Type 92 10cm Cannon NT AP5 WP5 NT AP5 WP5 15† n/a
-Year-38 Type 12cm Howitzer NT h-d AP5 NT h-d AP5 16† n/a
-Year-3 Type 14cm Naval Seacoast Gun T NM† T NM† 17†[1] D† E
-Year-4 Type 15cm Howitzer NT AP5 WP5 NT AP5 WP5 18† n/a Towing risk†
-Type 96 15cm Howitzer NT AP5 WP5 NT AP5 WP5 19† E
-Type 93 Twin-Mount High-Angle Machine Gun T 2 TK DR† T 2 TK DR† 20† A C†1 E Towing NA†1
-Type 98 High-Angle Machine Cannon T LF [NT, 20†, 2 ROF] T LF [NT, 20†, 2 ROF] 21† A
-Type 96 Naval High-Angle Machine Cannon T NM† T NM† 22†[1] D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon T NM† 2 TK DR†[1] T NM† 2 TK DR†[1] 22†[1] D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon T NM† 3 TK DR†[1] T NM† 3 TK DR†[1] 22†[1] D† E
-Type 88 7.5cm Mobile Field High-Angle Gun T T 23† E
-Year-10 Type 12cm Naval High-Angle Gun T NM† T NM† 24†[1] D† E
-Type 10 8cm Naval High-Angle Gun T NM† "13" AP TK†[1] T NM† "13" AP TK†[1] 25†[1] D† E
-Type 45 (1912) 24cm Howitzer NT NM No IF HE TK# 23 Tow NA NT NM No IF HE TK# 23 Tow NA 1† Jp D†1
+Type 92 Infantry Gun QSU h-d AP5 H6[5] WP5 QSU h-d AP5 H6 WP5 10† A
+Year-41 Type Mountain Gun QSU h-d H6[4+]† WP7 QSU h-d H6† WP7 11† A
+Year-38 Type Field Gun (Improved) QSU h-d WP6 "12" AP TK#† QSU h-d WP6 "12" AP TK#† 12† n/a
+Type 90 Field Gun QSU WP6 QSU WP6 13† n/a
+Type 91 10cm Field Howitzer 14† n/a
+Type 92 10cm Cannon AP5 WP5 AP5 WP5 15† n/a
+Year-38 Type 12cm Howitzer h-d AP5 h-d AP5 16† n/a
+Year-3 Type 14cm Naval Seacoast Gun NM† NM† 17†[1] D† E
+Year-4 Type 15cm Howitzer AP5 WP5 AP5 WP5 18† n/a Towing risk†
+Type 96 15cm Howitzer AP5 WP5 AP5 WP5 19† E
+Type 93 Twin-Mount High-Angle Machine Gun 2 TK DR† 2 TK DR† 20† A C†1 E Towing NA†1
+Type 98 High-Angle Machine Cannon LF [NT, 20†, 2 ROF] LF [NT, 20†, 2 ROF] 21† A
+Type 96 Naval High-Angle Machine Cannon NM† NM† 22†[1] D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon NM† 2 TK DR†[1] NM† 2 TK DR†[1] 22†[1] D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon NM† 3 TK DR†[1] NM† 3 TK DR†[1] 22†[1] D† E
+Type 88 7.5cm Mobile Field High-Angle Gun 23† E
+Year-10 Type 12cm Naval High-Angle Gun NM† NM† 24†[1] D† E
+Type 10 8cm Naval High-Angle Gun NM† "13" AP TK†[1] NM† "13" AP TK†[1] 25†[1] D† E
+Type 45 (1912) 24cm Howitzer NM No IF HE TK# 23 Tow NA NM No IF HE TK# 23 Tow NA 1† Jp D†1
Type 91 Vickers AA Gun AP TK# 8 LF [40(4), 1 ROF, B10] AP TK# 8 LF [40(4), 1 ROF, B10] 2† n/a
Type 91 Twin-mount Vickers AA Gun AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10] 3† n/a
-Type 4 75mm AA T AP6[44-] LF [75, 1 ROF, B11] T AP LF [75, 1 ROF, B11] 4† Ch G
+Type 4 75mm AA AP6[44-] LF [75, 1 ROF, B11] AP LF [75, 1 ROF, B11] 4† Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
index 141e94f..2d2c1a5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
index c1b886c..3e0ee61 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
index c4298f2..2e4c054 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
index 8782474..bb6fb63 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
index 9398f03..65dd83b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
index 2ddca42..5e42231 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
@@ -1,19 +1,19 @@
=== ordnance/polish/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------- --------------------- --------------------- --- --------- ---------------------
-46mm granatnik wz. 36 4PP 4PP 1 A P
-Ur. wz. 35 1PP 1PP 2 P
-75mm wz. 02/26 NT QSU h-d s6 NT QSU h-d s6 3 P
-100mm wz. 14/19 NT NT 4 A P
-75mm wz. 97/25 T NM T NM 5† P
-FK-A wz.38 Autocannon T QSU T QSU 1 A AllM T† No Gunshield. Tow NA†
-65mm wz.06 NT QSU C6† h-d NT QSU C6† h-d 2 B† AllM A No Gunshield.
-75mm wz.02/26 NT QSU h-d C6† s6 NT QSU h-d C6† s6 3 B†
-75mm wz.97 NT QSU C6† s8 NT QSU C6† s8 4 B†
-75mm wz.28 NT QSU h-d AP5 C6† s6 NT QSU h-d AP5 C6† s6 5 B† AllM A
-76mm wz.02 NT QSU h-d C6† s8 NT QSU h-d C6† s8 6 B†
-100mm wz.14/19 NT C6† NT C6† 7 B† AllM A
-100mm wz.29 NT C4† NT C4† 8 B†
-120mm wz.09/31 NT h-d C5† s6 NT h-d C5† s6 9 B†
-155mm wz.17 NT s8 NT s8 10 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- ------------------ ------------------ --- --------- ---------------------
+46mm granatnik wz. 36 4PP 4PP 1 A P
+Ur. wz. 35 1PP 1PP 2 P
+75mm wz. 02/26 QSU h-d s6 QSU h-d s6 3 P
+100mm wz. 14/19 4 A P
+75mm wz. 97/25 NM NM 5† P
+FK-A wz.38 Autocannon QSU QSU 1 A AllM T† No Gunshield. Tow NA†
+65mm wz.06 QSU C6† h-d QSU C6† h-d 2 B† AllM A No Gunshield.
+75mm wz.02/26 QSU h-d C6† s6 QSU h-d C6† s6 3 B†
+75mm wz.97 QSU C6† s8 QSU C6† s8 4 B†
+75mm wz.28 QSU h-d AP5 C6† s6 QSU h-d AP5 C6† s6 5 B† AllM A
+76mm wz.02 QSU h-d C6† s8 QSU h-d C6† s8 6 B†
+100mm wz.14/19 C6† C6† 7 B† AllM A
+100mm wz.29 C4† C4† 8 B†
+120mm wz.09/31 h-d C5† s6 h-d C5† s6 9 B†
+155mm wz.17 s8 s8 10 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
index 0953265..aa73a2d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1940 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
index 49adb68..2dc2132 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1941 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
index d1f7c9d..e226cf4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1942 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
index ea97ce6..10ac59f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1943 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
index f975bf1..c6cfb53 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1944 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
index 01c5cae..cffe695 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
@@ -1,26 +1,26 @@
=== ordnance/romanian/1945 ===
-Name Capabilities (effective) # Notes Comments
---------------------- ----------------- ----------------- --- ------- -------------
-Brandt M35 IR 5PP IR 5PP 1 A
-Bofors 37mm NT QSU NT QSU 2† A
-45mm PTP obr. 32 NT QSU NT QSU 3† n/a
-Resita M43 NT QSU AP TK#18† NT QSU AP TK#18† 4† n/a Blk TH
-76.2mm PaK 36(r) NT QSU s7 NT QSU s7 5 K†
-Breda 47 NT QSU NT QSU 6† A No Gunshield.
-75mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 7 A
-75 M mle 28 NT QSU h-d AP5 s5 NT QSU h-d AP5 s5 8 A
-Skoda M14/34 NT AP6 NT AP6 9† A
-76.2mm P obr. 00/02 NT QSU h-d s7 NT QSU h-d s7 10 n/a
-76.2mm P obr. 02/30 NT QSU h-d s7 NT QSU h-d s7 11 n/a
-76.2mm P obr. 39(r) NT QSU s5 NT QSU s5 12 K†
-s 10cm K 18(g) NT NM s5 NT NM s5 13 E
-Skoda M39(D9) NT NT 14 n/a
-Canon de 105L mle 36S NT NT 15 n/a
-Canon mle 10/12 NT h-d s4 NT h-d s4 16 n/a
-OQF 4.5in NT s4 NT s4 17 n/a
-Skoda M28 NOa NM ST NM ST 18 n/a No IF.
-Skoda M33 (K1) NT NT 19 n/a
-CA mle 38 T T 20 n/a
-Vickers/Resita M36/39 T T 21† n/a
-Kanon PL vz. 12/20 T NM T NM 22 n/a
+Name Capabilities (effective) # Notes Comments
+--------------------- -------------- -------------- --- ------- -------------
+Brandt M35 IR 5PP IR 5PP 1 A
+Bofors 37mm QSU QSU 2† A
+45mm PTP obr. 32 QSU QSU 3† n/a
+Resita M43 QSU AP TK#18† QSU AP TK#18† 4† n/a Blk TH
+76.2mm PaK 36(r) QSU s7 QSU s7 5 K†
+Breda 47 QSU QSU 6† A No Gunshield.
+75mm PP obr. 27 QSU H6 s8 QSU H6 s8 7 A
+75 M mle 28 QSU h-d AP5 s5 QSU h-d AP5 s5 8 A
+Skoda M14/34 AP6 AP6 9† A
+76.2mm P obr. 00/02 QSU h-d s7 QSU h-d s7 10 n/a
+76.2mm P obr. 02/30 QSU h-d s7 QSU h-d s7 11 n/a
+76.2mm P obr. 39(r) QSU s5 QSU s5 12 K†
+s 10cm K 18(g) NM s5 NM s5 13 E
+Skoda M39(D9) 14 n/a
+Canon de 105L mle 36S 15 n/a
+Canon mle 10/12 h-d s4 h-d s4 16 n/a
+OQF 4.5in s4 s4 17 n/a
+Skoda M28 NOa NM NM 18 n/a No IF.
+Skoda M33 (K1) 19 n/a
+CA mle 38 20 n/a
+Vickers/Resita M36/39 21† n/a
+Kanon PL vz. 12/20 NM NM 22 n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
index 64f5323..20e4371 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1940 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
index d53349d..50dd41f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1941 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
index ab608db..2de1734 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1942 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A4 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A4 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A4 s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU A4 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU A4 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU A4 s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU A4 s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
index 300e4fc..9f40bee 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1943 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A5 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A5 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A4 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A5 s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU A5 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU A5 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU A4 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU A5 s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU A4 s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
index 92dfd28..73f4755 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1944 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A6 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A6 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A5 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A6 s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU A5 s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU A6 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU A6 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU A5 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU A6 s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU A4 s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU A5 s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
index 3c95596..c245ae2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
@@ -1,36 +1,36 @@
=== ordnance/russian/1945 ===
-Name Capabilities (effective) # Notes Comments
--------------------- --------------------------- ---------------- ---- --------- ------------------------
-50mm RM obr. 40 4PP 4PP 1 n/a
-37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
-82mm BM obr. 37 NT QSU IR s8 NT QSU IR s8 2† n/a
-107mm GVPM obr. 38 NT QSU s8 NT QSU s8 3 A
-120mm PM obr. 38 NT QSU s8 NT QSU s8 4 n/a
-160mm PM obr. 43 NT NT 5 n/a No IF.
-37mm PTP obr. 30 NT QSU NT QSU 6 n/a
-45mm PTP obr. 32 NT QSU A4[2]5[3]6[4]7[5] NT QSU A7 7 n/a
-45mm PTP obr. 42 NT QSU A4[2]5[3]6[4]7[5] NT QSU A7 8 n/a
-57mm PTP obr. 43 NT QSU A4[3]5[4]6[5] NT QSU A6 9† n/a
-100mm PTP obr. 44 NT NT 10 n/a
-37mm PP obr. 15R NT QSU h-d NT QSU h-d 11 n/a
-76.2mm PP obr. 27 NT QSU H6 s8 NT QSU H6 s8 12 A
-76.2mm P obr. 00/02P NT QSU h-d s8 NT QSU h-d s8 13 n/a
-76.2mm P obr. 02/30 NT QSU h-d s8 NT QSU h-d s8 14 n/a
-76.2mm P obr. 39 NT QSU A4[2]5[3]6[4]7[5] s8 NT QSU A7 s8 15† n/a
-76.2mm P obr. 36 NT QSU A4[2] s8 NT QSU A4 s8 16† n/a
-85mm P obr. 44 NT QSU A5[4]6[5] s8 NT QSU A6 s8 17 n/a
-107mm P obr. 10/30 NT h-d s8 NT h-d s8 18 n/a
-122mm G obr. 10/30 NT h-d s8 NT h-d s8 19 n/a
-122mm G obr. 38 NT H6 s8 NT H6 s8 20 n/a
-122mm P obr. 31 NT s8 NT s8 21 n/a
-152mm G obr. 38 NT NT 22 n/a
-152mm GP obr. 37 NT NT 23 n/a
-203mm B-4 obr. 1931 NT RFNM NT RFNM 23.1 n/a No IF.
-25mm ZP obr. 40 T T 24 n/a
-37mm ZP obr. 39 T T 25† n/a
-76.2mm ZP obr. 38 T T 26† n/a
-85mm ZP obr. 39 T T 27 n/a
-37mm PTP obr. 30 NT QSU C5† NT QSU C5† 1 B†
-37mm PP obr. 15R NT QSU h-d C5† NT QSU h-d C5† 2 B†
-76.2mm PP obr. 27 NT QSU C6† H6 s8 NT QSU C6† H6 s8 3 A B† Ru A
+Name Capabilities (effective) # Notes Comments
+-------------------- ------------------------ ------------- ---- --------- ------------------------
+50mm RM obr. 40 4PP 4PP 1 n/a
+37mm PM-39 1PP 1PP 1.1 A Air Bursts & Acq. NA
+82mm BM obr. 37 QSU IR s8 QSU IR s8 2† n/a
+107mm GVPM obr. 38 QSU s8 QSU s8 3 A
+120mm PM obr. 38 QSU s8 QSU s8 4 n/a
+160mm PM obr. 43 5 n/a No IF.
+37mm PTP obr. 30 QSU QSU 6 n/a
+45mm PTP obr. 32 QSU A4[2]5[3]6[4]7[5] QSU A7 7 n/a
+45mm PTP obr. 42 QSU A4[2]5[3]6[4]7[5] QSU A7 8 n/a
+57mm PTP obr. 43 QSU A4[3]5[4]6[5] QSU A6 9† n/a
+100mm PTP obr. 44 10 n/a
+37mm PP obr. 15R QSU h-d QSU h-d 11 n/a
+76.2mm PP obr. 27 QSU H6 s8 QSU H6 s8 12 A
+76.2mm P obr. 00/02P QSU h-d s8 QSU h-d s8 13 n/a
+76.2mm P obr. 02/30 QSU h-d s8 QSU h-d s8 14 n/a
+76.2mm P obr. 39 QSU A4[2]5[3]6[4]7[5] s8 QSU A7 s8 15† n/a
+76.2mm P obr. 36 QSU A4[2] s8 QSU A4 s8 16† n/a
+85mm P obr. 44 QSU A5[4]6[5] s8 QSU A6 s8 17 n/a
+107mm P obr. 10/30 h-d s8 h-d s8 18 n/a
+122mm G obr. 10/30 h-d s8 h-d s8 19 n/a
+122mm G obr. 38 H6 s8 H6 s8 20 n/a
+122mm P obr. 31 s8 s8 21 n/a
+152mm G obr. 38 22 n/a
+152mm GP obr. 37 23 n/a
+203mm B-4 obr. 1931 RFNM RFNM 23.1 n/a No IF.
+25mm ZP obr. 40 24 n/a
+37mm ZP obr. 39 25† n/a
+76.2mm ZP obr. 38 26† n/a
+85mm ZP obr. 39 27 n/a
+37mm PTP obr. 30 QSU C5† QSU C5† 1 B†
+37mm PP obr. 15R QSU h-d C5† QSU h-d C5† 2 B†
+76.2mm PP obr. 27 QSU C6† H6 s8 QSU C6† H6 s8 3 A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
index 3a6eb36..024295b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1940 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU 29 E
+leIG 18(g) QSU H7[3+] QSU 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
index 02c9d11..7e1f1e3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1941 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU A5 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU A5 29 E
+leIG 18(g) QSU H7[3+] QSU 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
index fe69724..e980970 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1942 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU A4 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU A4 29 E
+leIG 18(g) QSU H7[3+] QSU 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
index 33b9070..320e362 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1943 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU A4 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU H7 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU A4 29 E
+leIG 18(g) QSU H7[3+] QSU H7 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
index 614744c..18c5d6b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1944 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU A4 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU H7 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU A4 29 E
+leIG 18(g) QSU H7[3+] QSU H7 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
index 706bbd9..36da43b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
@@ -1,11 +1,11 @@
=== ordnance/slovakian/1945 ===
-Name Capabilities (effective) # Notes Comments
-------------------- ---------------- ------------- --- ------- --------------
-Minomet vz. 36 NT QSU NT QSU 28 A
-Kanon PUV vz. 36(t) NT QSU A5[1]4[2] NT QSU A4 29 E
-leIG 18(g) NT QSU H7[3+] NT QSU H7 30 A E
-Skoda M37(K4) NT s6 NT s6 31 n/a
-Skoda 47L40(t) T QSU T QSU 32† E AA Fire ROF 2†
-Skoda PL vz. 37(t) T T 33 E
-Kanon PL vz. 22/24 ST ST 34† n/a
+Name Capabilities (effective) # Notes Comments
+------------------- -------------- ------------- --- ------- --------------
+Minomet vz. 36 QSU QSU 28 A
+Kanon PUV vz. 36(t) QSU A5[1]4[2] QSU A4 29 E
+leIG 18(g) QSU H7[3+] QSU H7 30 A E
+Skoda M37(K4) s6 s6 31 n/a
+Skoda 47L40(t) QSU QSU 32† E AA Fire ROF 2†
+Skoda PL vz. 37(t) 33 E
+Kanon PL vz. 22/24 34† n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
index ec631a7..02ddf2f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1940 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
index c0f1920..49252a7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1941 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
index 4e04e2f..14d9cce 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1942 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
index 1e8c399..d922a2f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1943 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
index dc313d7..cd3510f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1944 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
index ebba131..2b17730 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
@@ -1,8 +1,8 @@
=== ordnance/thai/1945 ===
-Name Capabilities (effective) # Notes Comments
-------------------------- ------------------------- ------------------------- --- ------- -------------
-50mm Krupp M1906 NT QSU h-d NT QSU h-d 4 n/a No Gunshield.
-75mm Krupp M1908 NT QSU h-d AP8 WP5 NT QSU h-d AP8 WP5 5 n/a
-Vickers 12.7mm AA Class D T QSU T QSU 8 n/a
-Bofors M30 75mm AA T AP6 LF [75, 1 ROF, B11] T AP6 LF [75, 1 ROF, B11] 9 Ch G†
+Name Capabilities (effective) # Notes Comments
+------------------------- ----------------------- ----------------------- --- ------- -------------
+50mm Krupp M1906 QSU h-d QSU h-d 4 n/a No Gunshield.
+75mm Krupp M1908 QSU h-d AP8 WP5 QSU h-d AP8 WP5 5 n/a
+Vickers 12.7mm AA Class D QSU QSU 8 n/a
+Bofors M30 75mm AA AP6 LF [75, 1 ROF, B11] AP6 LF [75, 1 ROF, B11] 9 Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
index b312554..7facf21 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
index e3a4a01..84297ac 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
index 8d3341d..f2e08f5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
index 71bc55c..deae26f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
index b9fd8b5..b9e3b31 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
index c24ed53..fb8f7d6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
@@ -2,6 +2,6 @@
Name Capabilities (effective) # Notes Comments
------------------ -------------- ------------- --- ------- ----------
-3.7cm Infantry Gun NT QSU h-d NT QSU h-d 20 Y
-80mm M28/M33 NT h-d s5 NT h-d s5 21 Y
-100mm M14/19 NT NT 22 Y
+3.7cm Infantry Gun QSU h-d QSU h-d 20 Y
+80mm M28/M33 h-d s5 h-d s5 21 Y
+100mm M14/19 22 Y
diff --git a/vasl_templates/webapp/tests/test_capabilities.py b/vasl_templates/webapp/tests/test_capabilities.py
index d60f23c..e0b93d3 100644
--- a/vasl_templates/webapp/tests/test_capabilities.py
+++ b/vasl_templates/webapp/tests/test_capabilities.py
@@ -14,6 +14,8 @@ from vasl_templates.webapp.tests.test_vo_reports import get_vo_report
from vasl_templates.webapp.tests.test_vehicles_ordnance import add_vo
from vasl_templates.webapp.tests.test_scenario_persistence import save_scenario, load_scenario
+IGNORE_CAPABILITIES = [ "T", "NT", "ST" ]
+
# ---------------------------------------------------------------------
@pytest.mark.skipif(
@@ -749,6 +751,9 @@ def test_capability_updates_in_ui( webapp, webdriver ):
for vo_entry in vo_entries:
capabilities = find_children( "span.vo-capability", vo_entry )
results[-1].append( [ c.get_attribute("innerHTML") for c in capabilities ] )
+ for row in expected:
+ for i,entries in enumerate(row):
+ row[i] = [ e for e in entries if e not in IGNORE_CAPABILITIES ]
assert results == expected
# no scenario date => we should be showing the raw capabilities
@@ -845,6 +850,8 @@ def _check_capabilities( webdriver, webapp,
merge_common = False,
row = row
)
+ for cap in IGNORE_CAPABILITIES:
+ expected = re.sub( r"(^|\s+){}($|\s+)".format(cap), "", expected )
assert capabilities == expected
def _get_capabilities( webdriver, webapp,