diff --git a/vasl_templates/webapp/data/vehicles/american.json b/vasl_templates/webapp/data/vehicles/american.json
index 2c63c08..35d8558 100644
--- a/vasl_templates/webapp/data/vehicles/american.json
+++ b/vasl_templates/webapp/data/vehicles/american.json
@@ -1,2 +1,360 @@
-{
+[
+
+{ "name": "M2A4",
+ "CS#": 4,
+ "capabilities2": { "C": [ [10,"P"], "\u20201" ] },
+ "note_number": "1",
+ "notes": [ "B\u2020", "C\u20201", "P" ]
+},
+{ "name": "M3",
+ "CS#": 4,
+ "capabilities2": { "C": [ [7,"A2+"], "\u20202" ] },
+ "note_number": "2\u2020",
+ "notes": [ "B\u20201", "C\u20202", "N" ]
+},
+{ "name": "M3A1",
+ "CS#": 4,
+ "capabilities": [ "C7\u20202" ],
+ "note_number": "3\u2020",
+ "notes": [ "C\u20202", "F\u20201", "G", "N" ]
+},
+{ "name": "M3A1 Satan",
+ "CS#": 4,
+ "note_number": "4",
+ "notes": [ "P" ]
+},
+{ "name": "M5A1",
+ "CS#": 4,
+ "capabilities": [ "C7\u20202" ],
+ "note_number": "5\u2020",
+ "notes": [ "C\u20202", "F\u20201", "G", "N", "Y" ]
+},
+{ "name": "M24",
+ "CS#": 5,
+ "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+ "note_number": "6\u2020",
+ "notes": [ "G", "P", "R\u20201" ]
+},
+{ "name": "M3",
+ "CS#": 7,
+ "capabilities": [ "C5\u20202" ],
+ "note_number": "7\u2020",
+ "notes": [ "B\u20201", "C\u20202", "G", "N" ]
+},
+{ "name": "M4",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u20203" ], "sM": [ [5,"4+"] ] },
+ "note_number": "8\u2020",
+ "notes": [ "F\u20202", "G", "R\u20201", "Y", "BB\u20203" ]
+},
+{ "name": "M4A1",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u20203" ], "sM": [ [5,"4+"] ] },
+ "note_number": "9\u2020",
+ "notes": [ "F\u20202", "G", "N", "R\u20201", "Y", "BB\u20203" ]
+},
+{ "name": "M4A2",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u20202" ], "sM": [ [5,"4+"] ] },
+ "note_number": "10",
+ "notes": [ "F\u20201", "G", "P", "R\u2020", "BB\u20202" ]
+},
+{ "name": "M4A2 (L)",
+ "CS#": "6:brewup",
+ "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+ "note_number": "11",
+ "notes": [ "F\u20201", "G", "P", "R\u2020" ]
+},
+{ "name": "M4A3",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u20203" ], "sM": [ [4,"4+"] ] },
+ "note_number": "12\u2020",
+ "notes": [ "F\u20202", "G", "R\u20201", "Y", "BB\u20203" ]
+},
+{ "name": "M4A3(75)W",
+ "CS#": 6,
+ "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+ "note_number": "13\u2020",
+ "notes": [ "F\u20202", "G", "R\u20201", "Y" ]
+},
+{ "name": "M4A3E2",
+ "CS#": 6,
+ "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+ "note_number": "14",
+ "notes": [ "F\u20201", "G", "P", "R\u2020" ]
+},
+{ "name": "M4A3E2 (L)",
+ "CS#": 6,
+ "capabilities2": { "A": [ [4,4], [5,5] ], "s": [ [5,5] ], "sM": 8 },
+ "note_number": "14\u2020",
+ "notes": [ "F\u20201", "G", "P" ]
+},
+{ "name": "M4A1(76)W",
+ "CS#": 6,
+ "capabilities2": { "A": [ [4,"A4"], [5,5], "\u20202" ], "s": [ [5,5] ], "sM": 8 },
+ "note_number": "15\u2020",
+ "notes": [ "A\u20202", "F\u20201", "G", "P", "Y" ]
+},
+{ "name": "M4A3(76)W",
+ "CS#": 6,
+ "capabilities2": { "A": [ [4,"A4"], [5,5], "\u20202" ], "s": [ [5,5] ], "sM": 8 },
+ "note_number": "16\u2020",
+ "notes": [ "A\u20202", "F\u20201", "G", "P", "Y" ]
+},
+{ "name": "M4(105)",
+ "CS#": 6,
+ "capabilities2": { "H": 9, "C": [ [7,"P"], "\u20201" ], "s": 7, "WP": 9, "sM": 8 },
+ "note_number": "17\u2020",
+ "notes": [ "C\u20201", "Y" ]
+},
+{ "name": "M4A3(105)",
+ "CS#": 6,
+ "capabilities2": { "H": 9, "C": [ [7,"P"], "\u20201" ], "s": 7, "WP": 9, "sM": 8 },
+ "note_number": "17\u2020",
+ "notes": [ "C\u20201", "Y" ]
+},
+{ "name": "M4 Tankdozer",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": 5, "WP": 7, "sM": 6 },
+ "note_number": "18\u2020",
+ "notes": [ "G", "R\u20201" ]
+},
+{ "name": "T1E3",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": 5, "WP": 7, "sM": 6 },
+ "note_number": "19\u2020",
+ "notes": [ "G", "P", "R\u20201" ]
+},
+{ "name": "Sherman Crab",
+ "CS#": "5:brewup",
+ "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u20202" ], "sM": 4 },
+ "note_number": "20\u2020",
+ "notes": [ "G", "R\u20201", "BB\u20202" ]
+},
+{ "name": "POA-CWS-H1",
+ "CS#": 6,
+ "capabilities2": { "sM": 8 },
+ "note_number": "21\u2020",
+ "notes": [ "P" ]
+},
+{ "name": "M26",
+ "CS#": 6,
+ "capabilities2": { "A": 7 },
+ "note_number": "22\u2020",
+ "notes": [ "P" ]
+},
+{ "name": "M10 GMC",
+ "CS#": 7,
+ "capabilities2": { "A": [ [5,"A4"], [6,5], "\u20201" ], "s": [ [5,5] ], "sP": 5 },
+ "note_number": "23\u2020",
+ "notes": [ "A\u20201", "N", "Y" ]
+},
+{ "name": "M18 GMC",
+ "CS#": 6,
+ "capabilities2": { "A": [ [5,4], [6,5], "\u20201" ], "s": [ [5,5] ], "sP": 5 },
+ "note_number": "24\u2020",
+ "notes": [ "A\u20201" ]
+},
+{ "name": "M36 GMC",
+ "CS#": 7,
+ "capabilities2": { "A": [ [5,5] ], "sP": 5 },
+ "note_number": "25\u2020",
+ "notes": [ "P" ]
+},
+{ "name": "M36B1 GMC",
+ "CS#": 7,
+ "capabilities2": { "A": 5, "sP": 5 },
+ "note_number": "26",
+ "notes": [ "P" ]
+},
+{ "name": "M2",
+ "CS#": 4,
+ "note_number": "27\u20201",
+ "notes": [ "E\u2020", "H", "I\u2020", "N" ]
+},
+{ "name": "M3",
+ "CS#": 5,
+ "note_number": "28\u2020",
+ "notes": [ "N" ]
+},
+{ "name": "M3A1",
+ "CS#": 5,
+ "note_number": "29\u20201",
+ "notes": [ "E\u2020", "H", "I\u2020", "Z" ]
+},
+{ "name": "M3(MMG)",
+ "CS#": 5,
+ "note_number": "30\u2020",
+ "notes": [ "E\u2020", "H", "N", "P" ]
+},
+{ "name": "M3(HMG)",
+ "CS#": 5,
+ "note_number": "30\u2020",
+ "notes": [ "E\u2020", "H", "N", "P" ]
+},
+{ "name": "M4 MC",
+ "CS#": "4:brewup",
+ "capabilities2": { "WP": 8 },
+ "note_number": "31\u2020",
+ "notes": [ "J\u2020", "M\u20201", "N", "O\u20202", "P" ]
+},
+{ "name": "M4A1 MC",
+ "CS#": "4:brewup",
+ "capabilities2": { "WP": 8 },
+ "note_number": "32\u2020",
+ "notes": [ "J\u20201", "M\u20202", "O\u20203" ]
+},
+{ "name": "M21 MC",
+ "CS#": "4:brewup",
+ "capabilities2": { "WP": 8 },
+ "note_number": "33",
+ "notes": [ "M", "O\u2020", "P" ]
+},
+{ "name": "M3 GMC",
+ "CS#": 4,
+ "note_number": "34\u2020",
+ "notes": [ "N", "U" ]
+},
+{ "name": "T30 HMC",
+ "CS#": 4,
+ "capabilities2": { "H": 5, "AP": 7, "WP": 9 },
+ "note_number": "35\u20201",
+ "notes": [ "K\u2020", "N", "O\u2020", "P", "U" ]
+},
+{ "name": "T19 HMC",
+ "CS#": 4,
+ "capabilities2": { "H": 5, "s": 7, "WP": 8 },
+ "note_number": "36\u2020",
+ "notes": [ "K\u20201", "N", "O\u20201", "P" ]
+},
+{ "name": "M15A1 MGMC",
+ "CS#": 4,
+ "note_number": "37\u2020",
+ "notes": [ "N", "V\u2020", "AA\u20201" ]
+},
+{ "name": "M16 MGMC",
+ "CS#": 4,
+ "note_number": "38\u2020",
+ "notes": [ "V\u2020", "AA\u20201" ]
+},
+{ "name": "M3A1",
+ "CS#": 4,
+ "note_number": "39\u20201",
+ "notes": [ "E\u2020", "H", "I\u2020", "N" ]
+},
+{ "name": "M20",
+ "CS#": 4,
+ "capabilities2": { "sP": 5 },
+ "note_number": "40\u2020",
+ "notes": [ "D\u20203", "O\u20202", "W\u20201", "Z" ]
+},
+{ "name": "T8",
+ "CS#": 5,
+ "note_number": "41\u2020",
+ "notes": [ "O\u20201", "P" ]
+},
+{ "name": "M8",
+ "CS#": 4,
+ "capabilities": [ "C7\u20202" ],
+ "capabilities2": { "sP": 5 },
+ "note_number": "42\u2020",
+ "notes": [ "C\u20202", "G", "W\u20201" ]
+},
+{ "name": "M8 HMC",
+ "CS#": 5,
+ "capabilities2": { "H": 9, "C": [ [4,"4+"], "\u20201" ], "WP": 9 },
+ "note_number": "43\u2020",
+ "notes": [ "C\u20201", "Y" ]
+},
+{ "name": "M7 HMC",
+ "CS#": 7,
+ "capabilities2": { "H": 7, "C": [ [7,"P"], "\u20201" ], "s": 7, "WP": 8 },
+ "note_number": "44\u2020",
+ "notes": [ "C\u20201", "N" ]
+},
+{ "name": "M12 GMC",
+ "CS#": 9,
+ "no_if": true,
+ "capabilities2": { "AP": 6, "WP": 8 },
+ "note_number": "45\u2020",
+ "notes": [ "P" ]
+},
+{ "name": "LVT(A)1",
+ "CS#": 6,
+ "capabilities2": { "C": [ [10,"P"], "\u20202" ] },
+ "note_number": "46\u20201",
+ "notes": [ "C\u20202", "G", "H", "P", "T\u2020" ]
+},
+{ "name": "LVT(A)4",
+ "CS#": 6,
+ "capabilities2": { "H": 8, "C": [ [7,"P"], "\u20203" ], "WP": 9 },
+ "note_number": "47\u2020",
+ "notes": [ "C\u20203", "P", "T\u20201", "X\u20202" ]
+},
+{ "name": "M4 DD",
+ "CS#": "6:brewup",
+ "capabilities2": { "s": 5, "WP": 7, "sM": 5 },
+ "note_number": "48",
+ "notes": [ "G", "P", "R\u2020" ]
+},
+{ "name": "LVT2",
+ "CS#": 6,
+ "note_number": "49\u2020",
+ "notes": [ "D\u20203", "H", "Q\u20202", "T\u20201" ]
+},
+{ "name": "LVT2(m)",
+ "CS#": 7,
+ "note_number": "49.1\u2020",
+ "notes": [ "D\u20203", "H", "P", "Q\u20202", "T\u20201" ]
+},
+{ "name": "LVT(A)2",
+ "CS#": 7,
+ "note_number": "50\u2020",
+ "notes": [ "D\u20203", "H", "Q\u20202", "T\u20201" ]
+},
+{ "name": "LVT4",
+ "CS#": 7,
+ "note_number": "51\u2020",
+ "notes": [ "D", "H", "T\u20201", "X\u20202" ]
+},
+{ "name": "M4 hst",
+ "CS#": 6,
+ "note_number": "51.1\u2020"
+},
+{ "name": "DUKW",
+ "cs#": "7\u20201",
+ "note_number": "52\u2020",
+ "notes": [ "D\u20203", "O\u20202", "CC\u20201" ]
+},
+{ "name": "\u00bc-Ton Jeep GPA",
+ "cs#": 2,
+ "note_number": "53\u2020",
+ "notes": [ "L\u20201" ]
+},
+{ "name": "\u00bc-Ton Jeep",
+ "cs#": "2\u20201",
+ "note_number": "54\u2020",
+ "notes": [ "L\u20202", "N", "O\u20203", "CC\u20201" ]
+},
+{ "name": "\u00be-Ton",
+ "cs#": 4,
+ "note_number": "55\u2020",
+ "notes": [ "N" ]
+},
+{ "name": "1\u00bd-Ton",
+ "cs#": 6,
+ "note_number": "56\u2020",
+ "notes": [ "N" ]
+},
+{ "name": "2\u00bd-Ton",
+ "cs#": 7,
+ "note_number": "57\u2020",
+ "notes": [ "N" ]
+},
+{ "name": "7\u00bd-Ton",
+ "cs#": 7,
+ "note_number": "58\u2020",
+ "notes": [ "N" ]
}
+
+]
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index e0e1d43..c695820 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -287,7 +287,7 @@ function make_capabilities( entry, scenario_theater, scenario_year, scenario_mon
capabilities.push( "LF [" + entry.capabilities2[key].join(", ") + "]" ) ;
continue ;
}
- if ( $.inArray( key, ["HE","AP","A","D","C","s","sD","sN","WP"] ) === -1 ) {
+ if ( $.inArray( key, ["HE","AP","A","D","C","s","sM","sD","sN","WP"] ) === -1 ) {
unexpected_caps.push( key ) ;
continue ;
}
@@ -304,7 +304,7 @@ function make_capabilities( entry, scenario_theater, scenario_year, scenario_mon
if ( ! cap )
continue ;
if ( cap == "" ) {
- invalid_caps.push( entry.name + ": " + key + " " + entry.capabilities2[key] ) ;
+ invalid_caps.push( entry.name + ": " + key + ": " + entry.capabilities2[key] ) ;
continue ;
}
capabilities.push( key + cap ) ;
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
index 690401e..da2b6ab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1940.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1940 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- ------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] n/a 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] n/a 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] n/a 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
index 6ca2d18..e930d37 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1941.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1941 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- ------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] n/a 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] n/a 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] n/a 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
index d1a72d9..b0f7a2d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1942.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1942 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- ------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] n/a 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] n/a 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] n/a 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
index 72b3de7..bea9071 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1943.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1943 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- ------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] C7†[2] 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] n/a 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] n/a 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] n/a 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
index debcef1..5815aa9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1944.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1944 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- ------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] C7†[2] 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] sM5 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] sM5 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] sM5 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] sM4 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 A4 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 A5†[1] sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 C4†[1] H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
index 037f64e..241b470 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/american/1945.txt
@@ -1,4 +1,67 @@
=== vehicles/american/1945 ===
-Name Radio IF Crew survival Capabilities (effective) # Notes
------- ------- ---- --------------- -------------- ------------- --- -------
+Name Radio IF Crew survival Capabilities (effective) # Notes
+------------------- ------- ---- ------------------------------------ ---------------------------- -------------- ------ ---------------------------------------------------
+M2A4 n/a yes CS 4 C10[P]†[1] n/a 1 B† C†1 P
+M3 n/a yes CS 4 C7[A2+]†[2] C7†[2] 2† B†1 C†2 N
+M3A1 n/a yes CS 4 C7†[2] C7†[2] 3† C†2 F†1 G N
+M3A1 Satan n/a yes CS 4 n/a n/a 4 P
+M5A1 n/a yes CS 4 C7†[2] C7†[2] 5† C†2 F†1 G N Y
+M24 n/a yes CS 5 WP7 s5 sM8 WP7 s5 sM8 6† G P R†1
+M3 n/a yes CS 7 C5†[2] C5†[2] 7† B†1 C†2 G N
+M4 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] WP7†[3] s5 sM5 8† F†2 G R†1 Y BB†3
+M4A1 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM5[4+] WP7†[3] s5 sM5 9† F†2 G N R†1 Y BB†3
+M4A2 n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM5[4+] WP7†[2] s5 sM5 10 F†1 G P R† BB†2
+M4A2 (L) n/a yes CS 6 (brew up) WP7 s5 sM8 WP7 s5 sM8 11 F†1 G P R†
+M4A3 n/a yes CS 5 (brew up) WP7[J4+]†[3] s5[J4+] sM4[4+] WP7†[3] s5 sM4 12† F†2 G R†1 Y BB†3
+M4A3(75)W n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 13† F†2 G R†1 Y
+M4A3E2 n/a yes CS 6 WP7 s5 sM8 WP7 s5 sM8 14 F†1 G P R†
+M4A3E2 (L) n/a yes CS 6 A4[4]5[5] s5[5] sM8 A5 s5 sM8 14† F†1 G P
+M4A1(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 A5†[2] s5 sM8 15† A†2 F†1 G P Y
+M4A3(76)W n/a yes CS 6 A4[A4]5[5]†[2] s5[5] sM8 A5†[2] s5 sM8 16† A†2 F†1 G P Y
+M4(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4A3(105) n/a yes CS 6 C7[P]†[1] H9 WP9 s7 sM8 H9 WP9 s7 sM8 17† C†1 Y
+M4 Tankdozer n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 18† G R†1
+T1E3 n/a yes CS 5 (brew up) WP7 s5 sM6 WP7 s5 sM6 19† G P R†1
+Sherman Crab n/a yes CS 5 (brew up) WP7[J4+]†[2] s5[J4+] sM4 WP7†[2] s5 sM4 20† G R†1 BB†2
+POA-CWS-H1 n/a yes CS 6 sM8 sM8 21† P
+M26 n/a yes CS 6 A7 A7 22† P
+M10 GMC n/a yes CS 7 A5[A4]6[5]†[1] s5[5] sP5 A6†[1] s5 sP5 23† A†1 N Y
+M18 GMC n/a yes CS 6 A5[4]6[5]†[1] s5[5] sP5 A6†[1] s5 sP5 24† A†1
+M36 GMC n/a yes CS 7 A5[5] sP5 A5 sP5 25† P
+M36B1 GMC n/a yes CS 7 A5 sP5 A5 sP5 26 P
+M2 n/a yes CS 4 n/a n/a 27†[1] E† H I† N
+M3 n/a yes CS 5 n/a n/a 28† N
+M3A1 n/a yes CS 5 n/a n/a 29†[1] E† H I† Z
+M3(MMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M3(HMG) n/a yes CS 5 n/a n/a 30† E† H N P
+M4 MC n/a yes CS 4 (brew up) WP8 WP8 31† J† M†1 N O†2 P
+M4A1 MC n/a yes CS 4 (brew up) WP8 WP8 32† J†1 M†2 O†3
+M21 MC n/a yes CS 4 (brew up) WP8 WP8 33 M O† P
+M3 GMC n/a yes CS 4 n/a n/a 34† N U
+T30 HMC n/a yes CS 4 AP7 H5 WP9 AP7 H5 WP9 35†[1] K† N O† P U
+T19 HMC n/a yes CS 4 H5 WP8 s7 H5 WP8 s7 36† K†1 N O†1 P
+M15A1 MGMC n/a yes CS 4 n/a n/a 37† N V† AA†1
+M16 MGMC n/a yes CS 4 n/a n/a 38† V† AA†1
+M3A1 n/a yes CS 4 n/a n/a 39†[1] E† H I† N
+M20 n/a yes CS 4 sP5 sP5 40† D†3 O†2 W†1 Z
+T8 n/a yes CS 5 n/a n/a 41† O†1 P
+M8 n/a yes CS 4 C7†[2] sP5 C7†[2] sP5 42† C†2 G W†1
+M8 HMC n/a yes CS 5 C4[4+]†[1] H9 WP9 C4†[1] H9 WP9 43† C†1 Y
+M7 HMC n/a yes CS 7 C7[P]†[1] H7 WP8 s7 H7 WP8 s7 44† C†1 N
+M12 GMC n/a n/a CS 9 AP6 WP8 AP6 WP8 45† P
+LVT(A)1 n/a yes CS 6 C10[P]†[2] n/a 46†[1] C†2 G H P T†
+LVT(A)4 n/a yes CS 6 C7[P]†[3] H8 WP9 H8 WP9 47† C†3 P T†1 X†2
+M4 DD n/a yes CS 6 (brew up) WP7 s5 sM5 WP7 s5 sM5 48 G P R†
+LVT2 n/a yes CS 6 n/a n/a 49† D†3 H Q†2 T†1
+LVT2(m) n/a yes CS 7 n/a n/a 49.1† D†3 H P Q†2 T†1
+LVT(A)2 n/a yes CS 7 n/a n/a 50† D†3 H Q†2 T†1
+LVT4 n/a yes CS 7 n/a n/a 51† D H T†1 X†2
+M4 hst n/a yes CS 6 n/a n/a 51.1† n/a
+DUKW n/a yes cs 7†1 n/a n/a 52† D†3 O†2 CC†1
+¼-Ton Jeep GPA n/a yes cs 2 n/a n/a 53† L†1
+¼-Ton Jeep n/a yes cs 2†1 n/a n/a 54† L†2 N O†3 CC†1
+¾-Ton n/a yes cs 4 n/a n/a 55† N
+1½-Ton n/a yes cs 6 n/a n/a 56† N
+2½-Ton n/a yes cs 7 n/a n/a 57† N
+7½-Ton n/a yes cs 7 n/a n/a 58† N