diff --git a/vasl_templates/webapp/data/ordnance/german.json b/vasl_templates/webapp/data/ordnance/german.json
index 93a27dc..f4c0faa 100644
--- a/vasl_templates/webapp/data/ordnance/german.json
+++ b/vasl_templates/webapp/data/ordnance/german.json
@@ -38,7 +38,7 @@
"capabilities": [ "NT", "QSU" ],
"capabilities_other": [ "uses APCR TK Table\u2020" ],
"note_number": "7",
- "notes": [ "A\u2020", "N" ]
+ "notes": [ "A\u2020", "NT" ]
},
{ "name": "5cm PaK 38",
"capabilities": [ "NT", "QSU" ],
@@ -50,13 +50,13 @@
"capabilities": [ "NT", "QSU" ],
"capabilities2": { "H": 6, "s": 7 },
"note_number": "9",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "7.5cm PaK 40",
"capabilities": [ "NT", "QSU" ],
"capabilities2": { "A": [ [5,2], [4,3], [3,4] ], "s": 7 },
"note_number": "10\u2020",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "7.62cm PaK 36r",
"capabilities": [ "NT", "QSU" ],
@@ -94,13 +94,13 @@
"capabilities": [ "T", "QSU" ],
"capabilities2": { "H": 6 },
"note_number": "17",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "10.5cm LG 42",
"capabilities": [ "T", "QSU" ],
"capabilities2": { "H": 6, "s": 6 },
"note_number": "18\u2020",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "7.5cm leFK 16nA",
"capabilities": [ "NT", "QSU", "h-d" ],
@@ -129,7 +129,7 @@
"capabilities": [ "NT", "RFNM" ],
"capabilities2": { "AP": 6 },
"note_number": "23",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "17cm K 18",
"capabilities": [ "NT", "RFNM", "no IF" ],
diff --git a/vasl_templates/webapp/data/vehicles/british.json b/vasl_templates/webapp/data/vehicles/british.json
index 0753d7c..0fb82e2 100644
--- a/vasl_templates/webapp/data/vehicles/british.json
+++ b/vasl_templates/webapp/data/vehicles/british.json
@@ -255,13 +255,13 @@
"CS#": 4,
"capabilities2": { "sM": 8 },
"note_number": "28\u2020",
- "notes": [ "K\u20201", "N" ]
+ "notes": [ "K\u20201", "NT" ]
},
{ "name": "Valentine VIII",
"CS#": 4,
"capabilities2": { "HE": 7, "sD": 6 },
"note_number": "29",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "Valentine XI",
"CS#": 4,
@@ -272,7 +272,7 @@
"CS#": 7,
"capabilities2": { "HE": "9\u20202", "s": [ null, "\u20202" ], "sD": [ [5,4] ], "sM": "8\u20201" },
"note_number": "31\u2020",
- "notes": [ "N", "S\u20202", "Z\u20201", "CC" ]
+ "notes": [ "NT", "S\u20202", "Z\u20201", "CC" ]
},
{ "name": "Churchill IV",
"CS#": 7,
@@ -374,7 +374,7 @@
{ "name": "Stuart Recce",
"CS#": 5,
"note_number": "44\u2020",
- "notes": [ "A", "D", "N", "P" ]
+ "notes": [ "A", "D", "NT", "P" ]
},
{ "name": "Humber III LRC",
"CS#": 3,
@@ -502,7 +502,7 @@
"CS#": 4,
"capabilities2": { "s": 8, "WP": [ [7,"J4+"], "\u20201" ] },
"note_number": "58\u2020",
- "notes": [ "A", "N", "W\u20201" ]
+ "notes": [ "A", "NT", "W\u20201" ]
},
{ "name": "Mk VI AA",
"CS#": 2,
diff --git a/vasl_templates/webapp/data/vehicles/german.json b/vasl_templates/webapp/data/vehicles/german.json
index d5415c6..7379d76 100644
--- a/vasl_templates/webapp/data/vehicles/german.json
+++ b/vasl_templates/webapp/data/vehicles/german.json
@@ -4,7 +4,7 @@
"CS#": 2,
"capabilities2": { "sD": 6 },
"note_number": "1\u2020",
- "notes": [ "N" ]
+ "notes": [ "NF" ]
},
{ "name": "PzKpfw IIA",
"CS#": 3,
@@ -109,7 +109,7 @@
"CS#": 5,
"capabilities2": { "H": 9, "s": 9, "sD": 7 },
"note_number": "16",
- "notes": [ "B\u2020", "N", "S" ]
+ "notes": [ "B\u2020", "NT", "S" ]
},
{ "name": "PzKpfw III(Fl)",
"CS#": 3,
@@ -189,7 +189,7 @@
"CS#": 6,
"capabilities2": { "A": [ [6,2] ], "sD": 7, "M": "7\u2020" },
"note_number": "30\u2020",
- "notes": [ "K", "N" ]
+ "notes": [ "K", "NFT" ]
},
{ "name": "PzKpfw VIE (L)",
"CS#": 6,
@@ -212,7 +212,7 @@
"CS#": 4,
"capabilities2": { "A": [ [6,2] ], "s": 8, "sD": 7 },
"note_number": "34\u2020",
- "notes": [ "N", "P\u2020", "S" ]
+ "notes": [ "NFT", "P\u2020", "S" ]
},
{ "name": "StuG IIIG (L)",
"CS#": 4,
@@ -224,7 +224,7 @@
"CS#": 4,
"capabilities2": { "H": 9, "s": 9, "sD": 7 },
"note_number": "36\u2020",
- "notes": [ "N", "P\u2020", "S" ]
+ "notes": [ "NFT", "P\u2020", "S" ]
},
{ "name": "StuH 42 (L)",
"CS#": 4,
@@ -308,13 +308,13 @@
"CS#": "4:brewup",
"capabilities2": { "A": [ [6,2] ], "HE": 7, "s": 7 },
"note_number": "46",
- "notes": [ "M\u2020", "N" ]
+ "notes": [ "M\u2020", "NFT" ]
},
{ "name": "Marder III(t)H",
"CS#": "4:brewup",
"capabilities2": { "A": [ [6,2] ], "HE": 7, "s": 7, "sD": 6 },
"note_number": "47",
- "notes": [ "E", "G", "N" ]
+ "notes": [ "E", "G", "NF" ]
},
{ "name": "Marder III(t)M",
"CS#": "4:brewup",
@@ -485,7 +485,7 @@
"CS#": 3,
"capabilities2": { "sD": 6 },
"note_number": "70\u2020",
- "notes": [ "A\u2020", "N" ]
+ "notes": [ "A\u2020", "NF" ]
},
{ "name": "PSW 231 (6 rad)",
"CS#": 4,
@@ -501,13 +501,13 @@
"CS#": 4,
"capabilities2": { "sD": 6 },
"note_number": "72",
- "notes": [ "N" ]
+ "notes": [ "NF" ]
},
{ "name": "PSW 233",
"CS#": 5,
"capabilities2": { "H": 8, "s": 9, "sD": 7 },
"note_number": "73",
- "notes": [ "N" ]
+ "notes": [ "NT" ]
},
{ "name": "PSW 234/1",
"CS#": 5,
@@ -549,7 +549,7 @@
"no_if": true,
"capabilities2": { "H": 6, "s": 9 },
"note_number": "80",
- "notes": [ "E", "N" ]
+ "notes": [ "E", "NFT" ]
},
{ "name": "PzA II",
"CS#": 4,
diff --git a/vasl_templates/webapp/data/vehicles/italian.json b/vasl_templates/webapp/data/vehicles/italian.json
index 0fbc4b9..838035e 100644
--- a/vasl_templates/webapp/data/vehicles/italian.json
+++ b/vasl_templates/webapp/data/vehicles/italian.json
@@ -101,7 +101,7 @@
{ "name": "SMV L40 47/32",
"CS#": 3,
"note_number": "15\u2020",
- "notes": [ "N", "R" ]
+ "notes": [ "NT", "R" ]
},
{ "name": "SMV M41M 90/53",
"CS#": 5,
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 31d7d4d..8a9c9f6 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,30 +1,30 @@
=== ordnance/german/1940 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
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 7a0160b..fe106b2 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,30 +1,30 @@
=== ordnance/german/1941 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
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 68e325c..2d2ae6f 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,30 +1,30 @@
=== ordnance/german/1942 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A5 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A6 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A5 s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
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 c227a5d..46af1e8 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,30 +1,30 @@
=== ordnance/german/1943 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A4 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A5 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A4 s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
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 cdeeaeb..b5ba251 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,30 +1,30 @@
=== ordnance/german/1944 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
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 6ae38f5..ec4049b 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,30 +1,30 @@
=== ordnance/german/1945 ===
Name Capabilities (effective) # Notes
-------------------- ------------------------------------- ------------------------------------- --- -------
+------------------- ------------------------------------- ------------------------------------- --- ----------------
5cm leGrW 5PP 5PP 1 N
8cm GrW 34 NT QSU IR s8 NT QSU IR s8 2† N
10cm NbW 35 NT QSU s10 NT QSU s10 3 O
12cm GrW 42 NT QSU s8 NT QSU s8 4† n/a
2.8cm sPzB 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 5† A† N P
3.7cm PaK 35/36 NT QSU A4[1]5[2]4[3]3[4] H6[9]† NT QSU A3 H6[9]† 6 B† N P
-4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† N
+4.2cm lePaK 41 NT QSU uses APCR TK Table† NT QSU uses APCR TK Table† 7 A† NT
5cm PaK 38 NT QSU A5[1]6[2]5[3]4[4] NT QSU A4 8† N
-7.5cm PaK 97/38 NT QSU H6 s7 NT QSU H6 s7 9 N
-7.5cm PaK 40 NT QSU A5[2]4[3]3[4] s7 NT QSU A3 s7 10† 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 N
-10.5cm LG 42 T QSU H6 s6 T QSU H6 s6 18† 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 N
+15cm K 18 NT RFNM AP6 NT RFNM AP6 23 NT
17cm K 18 NT RFNM no IF AP6 NT RFNM no IF AP6 24 N
2cm FlaK 30 T LF [20†, 2 ROF, B10, NT] T LF [20†, 2 ROF, B10, NT] 25 C† N
2cm FlaK 38 T LF [20†, 2 ROF, B11, NT] T LF [20†, 2 ROF, B11, NT] 26 C† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
index 83faa07..3d71956 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1940.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† n/a 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† n/a 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
index 11885c4..a884870 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1941.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† n/a 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† n/a 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
index 4950392..b855077 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1942.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† n/a 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† n/a 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
index f64e501..3c67251 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1943.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† n/a 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† n/a 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
index c8e0017..fd2ffcd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1944.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sD5 sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sD5 sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] HE8†[1] sD6 sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† sD4† 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† sD4† 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
index 4a2376d..563df27 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/british/1945.txt
@@ -44,10 +44,10 @@ Matilda I ® yes CS 2
Matilda II n/a yes CS 5 sD6 sD6 26† B†1 K†2 N P
Matilda II CS n/a yes CS 5 HE9†[2] s†[2] sD6 HE9†[2] s†[2] sD6 26† K†1 N P S†2
Valentine II n/a yes CS 4 sM8 sM8 27† N
-Valentine V n/a yes CS 4 sM8 sM8 28† K†1 N
-Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 N
+Valentine V n/a yes CS 4 sM8 sM8 28† K†1 NT
+Valentine VIII n/a yes CS 4 HE7 sD6 HE7 sD6 29 NT
Valentine XI n/a yes CS 4 WP6 s8 sD8 WP6 s8 sD8 30 n/a
-Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sD5 sM8†[1] 31† N S†2 Z†1 CC
+Churchill I n/a yes CS 7 HE9†[2] s†[2] sD5[4] sM8†[1] HE9†[2] s†[2] sD5 sM8†[1] 31† NT S†2 Z†1 CC
Churchill IV n/a yes CS 7 D6[J4]7[5]†[2] HE7[F3]8[4+]†[1] sD6[4+] sM8†[3] D7†[2] HE8†[1] sD6 sM8†[3] 32† J†2 N Y†1 Z†3 CC
Churchill V n/a yes CS 7 H6 s9 sD7 sM8†[1] H6 s9 sD7 sM8†[1] 33† S Z†1 CC
Churchill VI n/a yes CS 7 WP6[J4+]†[1] s8 sD7 sM8†[2] WP6†[1] s8 sD7 sM8†[2] 34† W†1 Z†2 CC
@@ -64,7 +64,7 @@ Archer n/a yes CS 5
Daimler n/a yes CS 2 sD4[4+]† sD4† 42† M N P
Lynx n/a yes CS 2 sD5 sD5 42† L†1 M P
Humber n/a yes CS 2 sD4[4+]† sD4† 43† L†1 M P BB†2
-Stuart Recce n/a yes CS 5 n/a n/a 44† A D N P
+Stuart Recce n/a yes CS 5 n/a n/a 44† A D NT P
Humber III LRC n/a yes CS 3 sD5 sD5 45† L†1 N P Q†2
Otter LRC n/a yes CS 3 sD5 sD5 45† L†1 P Q†2
Morris CS9 n/a yes CS 4 sD5 sD5 46† N Q†2 T†3 X†1
@@ -86,7 +86,7 @@ Staghound II(a) n/a yes CS 4
Bishop n/a n/a CS 5 s8 s8 55† K†1 N P
Priest(a) n/a yes CS 7 H6 WP7 s8 H6 WP7 s8 56† A N P
Sexton(a) n/a yes CS 7 s8 s8 57† A K†1
-M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 WP7†[1] s8 58† A N W†1
+M3 GMC(a) n/a yes CS 4 WP7[J4+]†[1] s8 WP7†[1] s8 58† A NT W†1
Mk VI AA n/a yes CS 2 n/a n/a 59† N O†1 AA†2
Crusader AA n/a yes CS 4 (brew up) sD7 sD7 60† AA†1
M17 MGMC(a) n/a yes CS 4 n/a n/a 61† A F† AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
index 7867a5d..9897818 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1940.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] n/a 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] n/a 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
index d37b585..ca8c16b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1941.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 A4 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] n/a 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] n/a 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
index 3554a7c..50aceb8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1942.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 A4 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 A6 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 A6 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] n/a 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] n/a 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
index 1db9cf0..9e1eefd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1943.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 A4 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 A6 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 A6 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] n/a 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] n/a 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 A5 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
index 4540731..06dff17 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1944.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 A4 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 A6 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 A6 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] sN7 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] A4 sN7 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 A4 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 A4 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 A4 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 A5 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
index 16eeec0..6e11d21 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/german/1945.txt
@@ -2,7 +2,7 @@
Name Radio IF Crew survival Capabilities (effective) # Notes
---------------------- ------- ---- ------------------------------------ ------------------- ------------- ----- ---------------------------------
-PzKpfw IB n/a yes CS 2 sD6 sD6 1† N
+PzKpfw IB n/a yes CS 2 sD6 sD6 1† NF
PzKpfw IIA n/a yes CS 3 sD6 sD6 2 n/a
PzKpfw IIF n/a yes CS 3 sD7 sD7 3 N
PzKpfw II(Fl) n/a yes CS 2 (brew up) sD7† sD7† 4† n/a
@@ -21,7 +21,7 @@ PzKpfw IIIG n/a yes CS 5 A4[
PzKpfw IIIH n/a yes CS 6 A4[1] sD7 A4 sD7 13† N
PzKpfw IIIJ n/a yes CS 6 A6[2] sD7 A6 sD7 14† N S
PzKpfw IIIL n/a yes CS 5 A6[2] sD7 A6 sD7 15† B† N S
-PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† N S
+PzKpfw IIIN n/a yes CS 5 H9 s9 sD7 H9 s9 sD7 16 B† NT S
PzKpfw III(Fl) n/a yes CS 3 sD7 sD7 17 n/a
PzKpfw IVA n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 18† n/a
PzKpfw IVC n/a yes CS 5 AP7 s9 sD6 AP7 s9 sD6 19† n/a
@@ -35,13 +35,13 @@ PzKpfw VD n/a yes CS 5 (brew up) sD5
PzKpfw VG n/a yes CS 6 sN7[4] sN7 27† H†
PzKpfw M15/42(i) n/a yes CS 4 n/a n/a 28 I
PzKpfw P26/40(i) n/a yes CS 4 s8 s8 29 I
-PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K N
+PzKpfw VIE n/a yes CS 6 A6[2] M7† sD7 A6 M7† sD7 30† K NFT
PzKpfw VIE (L) n/a yes CS 6 A4[4] sN7[4] A4 sN7 31 K
PzKpfw VIB n/a yes CS 6 sN9 sN9 32† K
StuG IIIB n/a yes CS 4 AP7 H6 s9 sD7 AP7 H6 s9 sD7 33† n/a
-StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† N P† S
+StuG IIIG n/a yes CS 4 A6[2] s8 sD7 A6 s8 sD7 34† NFT P† S
StuG IIIG (L) n/a yes CS 4 A4[4] s8 sN9 A4 s8 sN9 35 O† Q† S
-StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† N P† S
+StuH 42 n/a yes CS 4 H9 s9 sD7 H9 s9 sD7 36† NFT P† S
StuH 42 (L) n/a yes CS 4 H9 s9 sN9 H9 s9 sN9 35 O† Q† S
StuPz IV n/a n/a CS 6 H7 s9 H7 s9 37† S
Sturmtiger n/a n/a CS 5 sN9 sN9 37.1† K
@@ -55,8 +55,8 @@ PzJg 35R(f) n/a yes CS 3 A5[
Pz 35R 731(f) n/a yes CS 2 n/a n/a 44.1† a
Marder I n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 45† a
GSW 39H(f) Pak n/a yes CS 3 A4[4] HE9 A4 HE9 45.1 a e
-Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† N
-Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G N
+Marder II n/a yes CS 4 (brew up) A6[2] HE7 s7 A6 HE7 s7 46 M† NFT
+Marder III(t)H n/a yes CS 4 (brew up) A6[2] HE7 s7 sD6 A6 HE7 s7 sD6 47 E G NF
Marder III(t)M n/a yes CS 4 (brew up) A5[3] HE7 s7 sD5 A5 HE7 s7 sD5 48 E
PzJg III/IV n/a yes CS 5 HE7 HE7 49 M†
JgdPz 38(t) n/a yes CS 4 A4[4] HE7 A4 HE7 50 E O†
@@ -86,18 +86,18 @@ mSPW S307(f) n/a n/a CS 4 IR
Kfz 13 n/a yes CS 2 n/a n/a 68† n/a
PSW 221 n/a yes CS 2 sD6 sD6 69† A† N
PSW 222 n/a yes CS 3 sD6 sD6 70† A† N
-PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† N
+PSW 222 (L) n/a yes CS 3 sD6 sD6 70† A† NF
PSW 231 (6 rad) n/a yes CS 4 n/a n/a 71† n/a
PSW 231 (8 rad) n/a yes CS 4 sD6 sD6 72† N
-PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 N
-PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 N
+PSW 232 (8 rad) n/a yes CS 4 sD6 sD6 72 NF
+PSW 233 n/a yes CS 5 H8 s9 sD7 H8 s9 sD7 73 NT
PSW 234/1 n/a yes CS 5 n/a n/a 74 A†
PSW 234/2 n/a yes CS 4 A5[3] sD7 A5 sD7 75 n/a
PSW 234/3 n/a yes CS 5 H8 s9 H8 s9 76 Q†
PSW 234/4 n/a yes CS 5 (brew up) HE7 s7 HE7 s7 77† n/a
sIG IB n/a n/a CS 4 (brew up) H6 s9 H6 s9 78 G
sIG II n/a n/a CS 4 (brew up) H6 s9 H6 s9 79 N
-sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E N
+sIG 38(t)M n/a n/a CS 4 (brew up) H6 s9 H6 s9 80 E NFT
PzA II n/a yes CS 4 H5 s8 H5 s8 81 M†
PzA LrS(f) n/a n/a CS 4 H4 s8 H4 s8 82 a N
GSW 39H(f) n/a yes CS 4 H4 s7 H4 s7 82.1 a e
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
index cd17908..36a29d8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1940.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 s8
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
index 8e0e68d..bb6da73 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1941.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 s8
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
index 47dfd8e..a937946 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1942.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 s8
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
index 94febbe..e6c36cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1943.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 H7†[2]
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
index d3f529d..cd8a3ae 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1944.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 H7†[2]
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
index 6947251..54377b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/italian/1945.txt
@@ -19,7 +19,7 @@ SMV M41 75/18 n/a yes CS 3 H7[S2+]†[2] s8 H7†[2]
SMV M42 75/18 n/a yes CS 3 H7 s8 H7 s8 13 C†
SMV M42 75/32 n/a yes CS 3 H7 s8 H7 s8 13† C†1
SMV M43 105/25 n/a n/a CS 4 H7 s8 H7 s8 14 C†
-SMV L40 47/32 n/a yes CS 3 n/a n/a 15† N R
+SMV L40 47/32 n/a yes CS 3 n/a n/a 15† NT R
SMV M41M 90/53 n/a yes CS 5 HE7 HE7 16† D†1
AS 42 n/a yes CS 3 n/a n/a 17† L†1 M N
AS 42 aa n/a yes CS 4 n/a n/a 17† G†1 L†2 M N AA†1