diff --git a/vasl_templates/webapp/data/ordnance/british.json b/vasl_templates/webapp/data/ordnance/british.json
index 20591c6..d2ab1d9 100644
--- a/vasl_templates/webapp/data/ordnance/british.json
+++ b/vasl_templates/webapp/data/ordnance/british.json
@@ -4,7 +4,7 @@
"type": "MTR",
"capabilities2": { "s": 7, "IR": [ [null,"2+"], "\u2020" ] },
"note_number": "1",
- "notes": [ "A\u2020", "N", "P" ],
+ "notes": [ "A\u2020", "D", "N", "P" ],
"id": "br/o:000",
"gpid": 1153
},
@@ -13,6 +13,7 @@
"capabilities": [ "IR" ],
"capabilities2": { "s": 7 },
"note_number": "1",
+ "notes": [ "D" ],
"id": "br/o:001",
"gpid": 1149
},
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
index 0773fbc..b4fb980 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
index 3c7a386..149bd1c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
index 80b6774..a3b6624 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
index 941cb9d..99791e5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
index 080156d..fa432f1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
index e117475..cade0a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
---------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt
index c80686a..0595bc0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1940.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt
index cefe69d..5a277b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1941.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt
index 8ec7b86..7e51e35 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1942.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt
index 09f286b..1171ab8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1943.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt
index f0d0aa5..44a4669 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1944.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt
index 6f2584a..d9411a5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~anzac/1945.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1940.txt
index aca04e8..b746266 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1940.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1941.txt
index 708a418..294201c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1941.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1942.txt
index b525140..ae92238 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1942.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1943.txt
index 2e04e21..bbaa093 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1943.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1944.txt
index 8fc0fb6..51f196f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1944.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1945.txt
index c65b825..7f997c4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~australian/1945.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1940.txt
index 1e68bbd..5774c34 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1940.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
index 8da25eb..021257b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1941.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
index 7387e16..c3e1c90 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1942.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
index e798fbb..0e226de 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1943.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1944.txt
index 208e044..805cabe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1944.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1945.txt
index 5d7c2bb..ac3d0b3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~canadian/1945.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1940.txt
index 3c15a0c..4526e5a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1940.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
index bc28842..9c79b6d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1941.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
index c7e0eaf..b44de8d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1942.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
index 63f8b71..80e3406 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1943.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- -----------------------------------------------------------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee (15-cwt truck)
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1944.txt
index 9148cb5..9427ee7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1944.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1945.txt
index 1bce44b..0eade6e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british~newzealand/1945.txt
@@ -2,8 +2,8 @@
Name Capabilities (effective) # Notes Comments
--------------------------- --------------------------- --------------------------- --- -------------------- ------------------------------------
-OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† N P
-OML 2-in. Airborne Mortar IR s7 IR s7 1 n/a
+OML 2-in. Mortar IR[2+]† s7 IR† s7 1 A† D N P Animal-Packed
+OML 2-in. Airborne Mortar IR s7 IR s7 1 D Animal-Packed
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† 2† A†1 D N P QSU | Animal-Packed
OSB 4.2-in. Mortar WP7 s8 WP7 s8 3† N P Towed
OQF 25mm Hotchkiss 4† B N QSU | En Portee NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1940.txt
index 4207333..ec95c79 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1940.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- -----------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 Fr 22†[1] Fr W† QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
index a16717e..212e408 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1941.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- --------------------------------------------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† WP7 s8† Fr 22†[1] Fr W† QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
index 501e14a..b9565e5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1942.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- --------------------------------------------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† IR† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† Fr 22†[1] Fr W† QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
index b5a2173..7f924af 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1943.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- --------------------------------------------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† IR† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† Fr 22†[1] Fr W† QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1944.txt
index d6f80a9..0af1923 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1944.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- --------------------------------------------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† IR† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† Fr 22†[1] Fr W† QSU | Animal-Packed
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1945.txt
index 4c569ad..c4d464f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/free-french/1945.txt
@@ -3,7 +3,7 @@
Name Capabilities (effective) # Notes Comments
--------------------------- -------------------------- ------------------ --------- -------------------- --------------------------------------------------------------------------------------------------------------------------
LG de 50 mle 37(f) Fr 1 Fr A Fr B Fr C† Fr E Animal-Packed | Crewed
-OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W†
+OML 2-in. Mortar IR[2+]† s7 IR† s7 Fr 22†[1] Fr W† Animal-Packed
Mortier de 60 mle 35(f) IR[2+]† IR† Fr 2† Fr A Fr B Fr V Animal-Packed | No Captured Use penalty for Vichy French
M2 60mm Mortar IR WP7[5] IR WP7 Fr 22 Fr W†
OML 3-in. Mortar IR[2+]†[1] WP7 s8[1+]† IR†[1] WP7 s8† Fr 22†[1] Fr W† QSU | Animal-Packed