From c128209e7f55854c40e4673b9224f0aa123a081a Mon Sep 17 00:00:00 2001
From: Taka <taka@vm-linux-dev>
Date: Sat, 26 Jan 2019 08:36:59 +0000
Subject: [PATCH] Added support for BFP's "Blood & Jungle" and "Poland In
 Flames".

---
 .../default-template-pack/nationalities.json  |  28 +-
 .../data/default-template-pack/ob_ordnance.j2 |   5 +-
 .../ob_ordnance_ma_notes.j2                   |   2 +
 .../data/default-template-pack/ob_vehicles.j2 |   5 +-
 .../ob_vehicles_ma_notes.j2                   |   2 +
 .../webapp/data/expected-multiple-images.json |  16 +
 .../webapp/data/extensions/bfp-cobra.json     | 181 ++++
 .../webapp/data/extensions/bfp-pif.json       | 543 ++++++++++
 .../webapp/data/extensions/bfp-v403.json      | 938 ++++++++++++++++++
 .../webapp/data/extensions/kgs-v1.1.json      |   4 +
 .../data/ordnance/allied-minor/belgian.json   |   5 +-
 .../data/ordnance/allied-minor/common.json    |   6 +-
 .../webapp/data/ordnance/american.json        |   9 +-
 .../data/ordnance/axis-minor/bulgarian.json   |   6 +-
 .../data/ordnance/axis-minor/common.json      |   6 +-
 .../data/ordnance/axis-minor/croatian.json    |   3 +-
 .../data/ordnance/axis-minor/romanian.json    |   9 +-
 .../data/ordnance/axis-minor/slovakian.json   |   2 +-
 .../webapp/data/ordnance/british.json         |   9 +-
 .../webapp/data/ordnance/chinese.json         |   8 +-
 .../webapp/data/ordnance/chinese~gmd.json     |   1 +
 .../data/ordnance/communist-forces/cvpa.json  |   9 +-
 .../webapp/data/ordnance/finnish.json         |  24 +-
 .../webapp/data/ordnance/french.json          |  18 +-
 .../webapp/data/ordnance/german.json          |   7 +-
 .../webapp/data/ordnance/italian.json         |  12 +-
 .../webapp/data/ordnance/japanese.json        |  14 +-
 .../webapp/data/ordnance/russian.json         |   9 +-
 .../british-commonwealth-forces-korea.json    |   2 +-
 .../data/ordnance/un-forces/common.json       |   3 +-
 .../data/ordnance/un-forces/us-rok-ounc.json  |   9 +-
 .../webapp/data/vasl-overrides.json           |  31 +
 .../webapp/data/vehicles/chinese~gmd.json     |   1 +
 vasl_templates/webapp/file_server/utils.py    |  14 +-
 vasl_templates/webapp/file_server/vasl_mod.py |  22 +-
 vasl_templates/webapp/snippets.py             |  32 +-
 .../webapp/static/css/edit-vo-dialog.css      |  37 +-
 .../webapp/static/images/flags/anzac.png      | Bin 0 -> 28355 bytes
 .../webapp/static/images/flags/burmese.png    | Bin 0 -> 6382 bytes
 .../{chinese-gmd.png => chinese~gmd.png}      | Bin
 .../webapp/static/images/flags/filipino.png   | Bin 0 -> 33433 bytes
 .../webapp/static/images/flags/indonesian.png | Bin 0 -> 4264 bytes
 .../webapp/static/images/flags/polish.png     | Bin 20842 -> 12512 bytes
 .../webapp/static/images/flags/slovakian.png  | Bin 14143 -> 11768 bytes
 .../webapp/static/images/flags/thai.png       | Bin 0 -> 7284 bytes
 .../webapp/static/images/spacer.png           | Bin 0 -> 322 bytes
 vasl_templates/webapp/static/main.js          |  10 +-
 vasl_templates/webapp/static/snippets.js      |  94 +-
 vasl_templates/webapp/static/sortable.js      |   1 +
 vasl_templates/webapp/static/utils.js         |   2 +-
 vasl_templates/webapp/static/vo.js            |  11 +-
 vasl_templates/webapp/static/vo2.js           |  92 +-
 .../webapp/templates/edit-vo-dialog.html      |  17 +-
 .../webapp/templates/vo-notes-report.html     |  27 +-
 .../webapp/templates/vo-report.html           |   4 +-
 .../data/default-template-pack/ob_ordnance.j2 |   3 +-
 .../data/default-template-pack/ob_vehicles.j2 |   3 +-
 .../tests/fixtures/data/vehicles/german.json  |   4 +
 .../fixtures/vo-reports/landing-craft.txt     |   4 +-
 .../ordnance/allied-minor-common/1940.txt     |   8 +-
 .../ordnance/allied-minor-common/1941.txt     |   8 +-
 .../ordnance/allied-minor-common/1942.txt     |   8 +-
 .../ordnance/allied-minor-common/1943.txt     |   8 +-
 .../ordnance/allied-minor-common/1944.txt     |   8 +-
 .../ordnance/allied-minor-common/1945.txt     |   8 +-
 .../vo-reports/ordnance/american/1940.txt     |  11 +-
 .../vo-reports/ordnance/american/1941.txt     |  11 +-
 .../vo-reports/ordnance/american/1942.txt     |  11 +-
 .../vo-reports/ordnance/american/1943.txt     |  11 +-
 .../vo-reports/ordnance/american/1944.txt     |  11 +-
 .../vo-reports/ordnance/american/1945.txt     |  11 +-
 .../ordnance/axis-minor-common/1940.txt       |   8 +-
 .../ordnance/axis-minor-common/1941.txt       |   8 +-
 .../ordnance/axis-minor-common/1942.txt       |   8 +-
 .../ordnance/axis-minor-common/1943.txt       |   8 +-
 .../ordnance/axis-minor-common/1944.txt       |   8 +-
 .../ordnance/axis-minor-common/1945.txt       |   8 +-
 .../vo-reports/ordnance/belgian/1940.txt      |   8 +-
 .../vo-reports/ordnance/belgian/1941.txt      |   8 +-
 .../vo-reports/ordnance/belgian/1942.txt      |   8 +-
 .../vo-reports/ordnance/belgian/1943.txt      |   8 +-
 .../vo-reports/ordnance/belgian/1944.txt      |   8 +-
 .../vo-reports/ordnance/belgian/1945.txt      |   8 +-
 .../vo-reports/ordnance/british/1940.txt      |  10 +-
 .../vo-reports/ordnance/british/1941.txt      |  10 +-
 .../vo-reports/ordnance/british/1942.txt      |  10 +-
 .../vo-reports/ordnance/british/1943.txt      |  10 +-
 .../vo-reports/ordnance/british/1944.txt      |  10 +-
 .../vo-reports/ordnance/british/1945.txt      |  10 +-
 .../vo-reports/ordnance/bulgarian/1940.txt    |  20 +-
 .../vo-reports/ordnance/bulgarian/1941.txt    |  20 +-
 .../vo-reports/ordnance/bulgarian/1942.txt    |  20 +-
 .../vo-reports/ordnance/bulgarian/1943.txt    |  20 +-
 .../vo-reports/ordnance/bulgarian/1944.txt    |  20 +-
 .../vo-reports/ordnance/bulgarian/1945.txt    |  20 +-
 .../vo-reports/ordnance/chinese/1940.txt      |  10 +-
 .../vo-reports/ordnance/chinese/1941.txt      |  10 +-
 .../vo-reports/ordnance/chinese/1942.txt      |  10 +-
 .../vo-reports/ordnance/chinese/1943.txt      |  10 +-
 .../vo-reports/ordnance/chinese/1944.txt      |  10 +-
 .../vo-reports/ordnance/chinese/1945.txt      |  10 +-
 .../vo-reports/ordnance/chinese~gmd/1940.txt  |  40 +
 .../vo-reports/ordnance/chinese~gmd/1941.txt  |  40 +
 .../vo-reports/ordnance/chinese~gmd/1942.txt  |  40 +
 .../vo-reports/ordnance/chinese~gmd/1943.txt  |  40 +
 .../vo-reports/ordnance/chinese~gmd/1944.txt  |  40 +
 .../vo-reports/ordnance/chinese~gmd/1945.txt  |  40 +
 .../vo-reports/ordnance/croatian/1940.txt     |   8 +-
 .../vo-reports/ordnance/croatian/1941.txt     |   8 +-
 .../vo-reports/ordnance/croatian/1942.txt     |   8 +-
 .../vo-reports/ordnance/croatian/1943.txt     |   8 +-
 .../vo-reports/ordnance/croatian/1944.txt     |   8 +-
 .../vo-reports/ordnance/croatian/1945.txt     |   8 +-
 .../vo-reports/ordnance/danish/1940.txt       |   4 +-
 .../vo-reports/ordnance/danish/1941.txt       |   4 +-
 .../vo-reports/ordnance/danish/1942.txt       |   4 +-
 .../vo-reports/ordnance/danish/1943.txt       |   4 +-
 .../vo-reports/ordnance/danish/1944.txt       |   4 +-
 .../vo-reports/ordnance/danish/1945.txt       |   4 +-
 .../vo-reports/ordnance/dutch/1940.txt        |  11 +-
 .../vo-reports/ordnance/dutch/1941.txt        |  11 +-
 .../vo-reports/ordnance/dutch/1942.txt        |  11 +-
 .../vo-reports/ordnance/dutch/1943.txt        |  11 +-
 .../vo-reports/ordnance/dutch/1944.txt        |  11 +-
 .../vo-reports/ordnance/dutch/1945.txt        |  11 +-
 .../vo-reports/ordnance/finnish/1940.txt      |  20 +-
 .../vo-reports/ordnance/finnish/1941.txt      |  20 +-
 .../vo-reports/ordnance/finnish/1942.txt      |  20 +-
 .../vo-reports/ordnance/finnish/1943.txt      |  20 +-
 .../vo-reports/ordnance/finnish/1944.txt      |  20 +-
 .../vo-reports/ordnance/finnish/1945.txt      |  20 +-
 .../vo-reports/ordnance/french/1940.txt       |  46 +-
 .../vo-reports/ordnance/french/1941.txt       |  46 +-
 .../vo-reports/ordnance/french/1942.txt       |  46 +-
 .../vo-reports/ordnance/french/1943.txt       |  46 +-
 .../vo-reports/ordnance/french/1944.txt       |  46 +-
 .../vo-reports/ordnance/french/1945.txt       |  46 +-
 .../vo-reports/ordnance/german/1940.txt       |  68 +-
 .../vo-reports/ordnance/german/1941.txt       |  68 +-
 .../vo-reports/ordnance/german/1942.txt       |  68 +-
 .../vo-reports/ordnance/german/1943.txt       |  68 +-
 .../vo-reports/ordnance/german/1944.txt       |  68 +-
 .../vo-reports/ordnance/german/1945.txt       |  68 +-
 .../vo-reports/ordnance/greek/1940.txt        |   4 +-
 .../vo-reports/ordnance/greek/1941.txt        |   4 +-
 .../vo-reports/ordnance/greek/1942.txt        |   4 +-
 .../vo-reports/ordnance/greek/1943.txt        |   4 +-
 .../vo-reports/ordnance/greek/1944.txt        |   4 +-
 .../vo-reports/ordnance/greek/1945.txt        |   4 +-
 .../vo-reports/ordnance/hungarian/1940.txt    |   4 +-
 .../vo-reports/ordnance/hungarian/1941.txt    |   4 +-
 .../vo-reports/ordnance/hungarian/1942.txt    |   4 +-
 .../vo-reports/ordnance/hungarian/1943.txt    |   4 +-
 .../vo-reports/ordnance/hungarian/1944.txt    |   4 +-
 .../vo-reports/ordnance/hungarian/1945.txt    |   4 +-
 .../vo-reports/ordnance/indonesian/1940.txt   |  10 +
 .../vo-reports/ordnance/indonesian/1941.txt   |  10 +
 .../vo-reports/ordnance/indonesian/1942.txt   |  10 +
 .../vo-reports/ordnance/indonesian/1943.txt   |  10 +
 .../vo-reports/ordnance/indonesian/1944.txt   |  10 +
 .../vo-reports/ordnance/indonesian/1945.txt   |  10 +
 .../vo-reports/ordnance/italian/1940.txt      |  44 +-
 .../vo-reports/ordnance/italian/1941.txt      |  44 +-
 .../vo-reports/ordnance/italian/1942.txt      |  44 +-
 .../vo-reports/ordnance/italian/1943.txt      |  44 +-
 .../vo-reports/ordnance/italian/1944.txt      |  44 +-
 .../vo-reports/ordnance/italian/1945.txt      |  44 +-
 .../vo-reports/ordnance/japanese/1940.txt     |  62 +-
 .../vo-reports/ordnance/japanese/1941.txt     |  62 +-
 .../vo-reports/ordnance/japanese/1942.txt     |  62 +-
 .../vo-reports/ordnance/japanese/1943.txt     |  62 +-
 .../vo-reports/ordnance/japanese/1944.txt     |  62 +-
 .../vo-reports/ordnance/japanese/1945.txt     |  62 +-
 .../vo-reports/ordnance/polish/1940.txt       |  24 +-
 .../vo-reports/ordnance/polish/1941.txt       |  24 +-
 .../vo-reports/ordnance/polish/1942.txt       |  24 +-
 .../vo-reports/ordnance/polish/1943.txt       |  24 +-
 .../vo-reports/ordnance/polish/1944.txt       |  24 +-
 .../vo-reports/ordnance/polish/1945.txt       |  24 +-
 .../vo-reports/ordnance/romanian/1940.txt     |  48 +-
 .../vo-reports/ordnance/romanian/1941.txt     |  48 +-
 .../vo-reports/ordnance/romanian/1942.txt     |  48 +-
 .../vo-reports/ordnance/romanian/1943.txt     |  48 +-
 .../vo-reports/ordnance/romanian/1944.txt     |  48 +-
 .../vo-reports/ordnance/romanian/1945.txt     |  48 +-
 .../vo-reports/ordnance/russian/1940.txt      |  65 +-
 .../vo-reports/ordnance/russian/1941.txt      |  65 +-
 .../vo-reports/ordnance/russian/1942.txt      |  65 +-
 .../vo-reports/ordnance/russian/1943.txt      |  65 +-
 .../vo-reports/ordnance/russian/1944.txt      |  65 +-
 .../vo-reports/ordnance/russian/1945.txt      |  65 +-
 .../vo-reports/ordnance/slovakian/1940.txt    |  18 +-
 .../vo-reports/ordnance/slovakian/1941.txt    |  18 +-
 .../vo-reports/ordnance/slovakian/1942.txt    |  18 +-
 .../vo-reports/ordnance/slovakian/1943.txt    |  18 +-
 .../vo-reports/ordnance/slovakian/1944.txt    |  18 +-
 .../vo-reports/ordnance/slovakian/1945.txt    |  18 +-
 .../vo-reports/ordnance/thai/1940.txt         |   8 +
 .../vo-reports/ordnance/thai/1941.txt         |   8 +
 .../vo-reports/ordnance/thai/1942.txt         |   8 +
 .../vo-reports/ordnance/thai/1943.txt         |   8 +
 .../vo-reports/ordnance/thai/1944.txt         |   8 +
 .../vo-reports/ordnance/thai/1945.txt         |   8 +
 .../vo-reports/ordnance/yugoslavian/1940.txt  |   4 +-
 .../vo-reports/ordnance/yugoslavian/1941.txt  |   4 +-
 .../vo-reports/ordnance/yugoslavian/1942.txt  |   4 +-
 .../vo-reports/ordnance/yugoslavian/1943.txt  |   4 +-
 .../vo-reports/ordnance/yugoslavian/1944.txt  |   4 +-
 .../vo-reports/ordnance/yugoslavian/1945.txt  |   4 +-
 .../vehicles/allied-minor-common/1940.txt     |   4 +-
 .../vehicles/allied-minor-common/1941.txt     |   4 +-
 .../vehicles/allied-minor-common/1942.txt     |   4 +-
 .../vehicles/allied-minor-common/1943.txt     |   4 +-
 .../vehicles/allied-minor-common/1944.txt     |   4 +-
 .../vehicles/allied-minor-common/1945.txt     |   4 +-
 .../vo-reports/vehicles/american/1940.txt     |  33 +-
 .../vo-reports/vehicles/american/1941.txt     |  33 +-
 .../vo-reports/vehicles/american/1942.txt     |  33 +-
 .../vo-reports/vehicles/american/1943.txt     |  33 +-
 .../vo-reports/vehicles/american/1944.txt     |  33 +-
 .../vo-reports/vehicles/american/1945.txt     |  33 +-
 .../vo-reports/vehicles/anzac/1940.txt        |   8 +
 .../vo-reports/vehicles/anzac/1941.txt        |   8 +
 .../vo-reports/vehicles/anzac/1942.txt        |   8 +
 .../vo-reports/vehicles/anzac/1943.txt        |   8 +
 .../vo-reports/vehicles/anzac/1944.txt        |   8 +
 .../vo-reports/vehicles/anzac/1945.txt        |   8 +
 .../vehicles/axis-minor-common/1940.txt       |   4 +-
 .../vehicles/axis-minor-common/1941.txt       |   4 +-
 .../vehicles/axis-minor-common/1942.txt       |   4 +-
 .../vehicles/axis-minor-common/1943.txt       |   4 +-
 .../vehicles/axis-minor-common/1944.txt       |   4 +-
 .../vehicles/axis-minor-common/1945.txt       |   4 +-
 .../vo-reports/vehicles/belgian/1940.txt      |   4 +-
 .../vo-reports/vehicles/belgian/1941.txt      |   4 +-
 .../vo-reports/vehicles/belgian/1942.txt      |   4 +-
 .../vo-reports/vehicles/belgian/1943.txt      |   4 +-
 .../vo-reports/vehicles/belgian/1944.txt      |   4 +-
 .../vo-reports/vehicles/belgian/1945.txt      |   4 +-
 .../vo-reports/vehicles/british/1940.txt      |   4 +-
 .../vo-reports/vehicles/british/1941.txt      |   4 +-
 .../vo-reports/vehicles/british/1942.txt      |   4 +-
 .../vo-reports/vehicles/british/1943.txt      |   4 +-
 .../vo-reports/vehicles/british/1944.txt      |   4 +-
 .../vo-reports/vehicles/british/1945.txt      |   4 +-
 .../vo-reports/vehicles/bulgarian/1940.txt    |   4 +-
 .../vo-reports/vehicles/bulgarian/1941.txt    |   4 +-
 .../vo-reports/vehicles/bulgarian/1942.txt    |   4 +-
 .../vo-reports/vehicles/bulgarian/1943.txt    |   4 +-
 .../vo-reports/vehicles/bulgarian/1944.txt    |   4 +-
 .../vo-reports/vehicles/bulgarian/1945.txt    |   4 +-
 .../vo-reports/vehicles/chinese/1940.txt      |  55 +-
 .../vo-reports/vehicles/chinese/1941.txt      |  55 +-
 .../vo-reports/vehicles/chinese/1942.txt      |  55 +-
 .../vo-reports/vehicles/chinese/1943.txt      |  55 +-
 .../vo-reports/vehicles/chinese/1944.txt      |  55 +-
 .../vo-reports/vehicles/chinese/1945.txt      |  55 +-
 .../vo-reports/vehicles/chinese~gmd/1940.txt  |  34 +
 .../vo-reports/vehicles/chinese~gmd/1941.txt  |  34 +
 .../vo-reports/vehicles/chinese~gmd/1942.txt  |  34 +
 .../vo-reports/vehicles/chinese~gmd/1943.txt  |  34 +
 .../vo-reports/vehicles/chinese~gmd/1944.txt  |  34 +
 .../vo-reports/vehicles/chinese~gmd/1945.txt  |  34 +
 .../vo-reports/vehicles/croatian/1940.txt     |   4 +-
 .../vo-reports/vehicles/croatian/1941.txt     |   4 +-
 .../vo-reports/vehicles/croatian/1942.txt     |   4 +-
 .../vo-reports/vehicles/croatian/1943.txt     |   4 +-
 .../vo-reports/vehicles/croatian/1944.txt     |   4 +-
 .../vo-reports/vehicles/croatian/1945.txt     |   4 +-
 .../vo-reports/vehicles/danish/1940.txt       |   4 +-
 .../vo-reports/vehicles/danish/1941.txt       |   4 +-
 .../vo-reports/vehicles/danish/1942.txt       |   4 +-
 .../vo-reports/vehicles/danish/1943.txt       |   4 +-
 .../vo-reports/vehicles/danish/1944.txt       |   4 +-
 .../vo-reports/vehicles/danish/1945.txt       |   4 +-
 .../vo-reports/vehicles/dutch/1940.txt        |  24 +-
 .../vo-reports/vehicles/dutch/1941.txt        |  24 +-
 .../vo-reports/vehicles/dutch/1942.txt        |  24 +-
 .../vo-reports/vehicles/dutch/1943.txt        |  24 +-
 .../vo-reports/vehicles/dutch/1944.txt        |  24 +-
 .../vo-reports/vehicles/dutch/1945.txt        |  24 +-
 .../vo-reports/vehicles/finnish/1940.txt      |   4 +-
 .../vo-reports/vehicles/finnish/1941.txt      |   4 +-
 .../vo-reports/vehicles/finnish/1942.txt      |   4 +-
 .../vo-reports/vehicles/finnish/1943.txt      |   4 +-
 .../vo-reports/vehicles/finnish/1944.txt      |   4 +-
 .../vo-reports/vehicles/finnish/1945.txt      |   4 +-
 .../vo-reports/vehicles/french/1940.txt       |   4 +-
 .../vo-reports/vehicles/french/1941.txt       |   4 +-
 .../vo-reports/vehicles/french/1942.txt       |   4 +-
 .../vo-reports/vehicles/french/1943.txt       |   4 +-
 .../vo-reports/vehicles/french/1944.txt       |   4 +-
 .../vo-reports/vehicles/french/1945.txt       |   4 +-
 .../vo-reports/vehicles/german/1940.txt       | 251 ++---
 .../vo-reports/vehicles/german/1941.txt       | 251 ++---
 .../vo-reports/vehicles/german/1942.txt       | 251 ++---
 .../vo-reports/vehicles/german/1943.txt       | 251 ++---
 .../vo-reports/vehicles/german/1944.txt       | 251 ++---
 .../vo-reports/vehicles/german/1945.txt       | 251 ++---
 .../vo-reports/vehicles/greek/1940.txt        |   4 +-
 .../vo-reports/vehicles/greek/1941.txt        |   4 +-
 .../vo-reports/vehicles/greek/1942.txt        |   4 +-
 .../vo-reports/vehicles/greek/1943.txt        |   4 +-
 .../vo-reports/vehicles/greek/1944.txt        |   4 +-
 .../vo-reports/vehicles/greek/1945.txt        |   4 +-
 .../vo-reports/vehicles/hungarian/1940.txt    |   4 +-
 .../vo-reports/vehicles/hungarian/1941.txt    |   4 +-
 .../vo-reports/vehicles/hungarian/1942.txt    |   4 +-
 .../vo-reports/vehicles/hungarian/1943.txt    |   4 +-
 .../vo-reports/vehicles/hungarian/1944.txt    |   4 +-
 .../vo-reports/vehicles/hungarian/1945.txt    |   4 +-
 .../vo-reports/vehicles/indonesian/1940.txt   |  17 +
 .../vo-reports/vehicles/indonesian/1941.txt   |  17 +
 .../vo-reports/vehicles/indonesian/1942.txt   |  17 +
 .../vo-reports/vehicles/indonesian/1943.txt   |  17 +
 .../vo-reports/vehicles/indonesian/1944.txt   |  17 +
 .../vo-reports/vehicles/indonesian/1945.txt   |  17 +
 .../vo-reports/vehicles/italian/1940.txt      |   4 +-
 .../vo-reports/vehicles/italian/1941.txt      |   4 +-
 .../vo-reports/vehicles/italian/1942.txt      |   4 +-
 .../vo-reports/vehicles/italian/1943.txt      |   4 +-
 .../vo-reports/vehicles/italian/1944.txt      |   4 +-
 .../vo-reports/vehicles/italian/1945.txt      |   4 +-
 .../vo-reports/vehicles/japanese/1940.txt     |  30 +-
 .../vo-reports/vehicles/japanese/1941.txt     |  30 +-
 .../vo-reports/vehicles/japanese/1942.txt     |  30 +-
 .../vo-reports/vehicles/japanese/1943.txt     |  30 +-
 .../vo-reports/vehicles/japanese/1944.txt     |  30 +-
 .../vo-reports/vehicles/japanese/1945.txt     |  30 +-
 .../vo-reports/vehicles/polish/1940.txt       |  50 +-
 .../vo-reports/vehicles/polish/1941.txt       |  50 +-
 .../vo-reports/vehicles/polish/1942.txt       |  50 +-
 .../vo-reports/vehicles/polish/1943.txt       |  50 +-
 .../vo-reports/vehicles/polish/1944.txt       |  50 +-
 .../vo-reports/vehicles/polish/1945.txt       |  50 +-
 .../vo-reports/vehicles/romanian/1940.txt     |   4 +-
 .../vo-reports/vehicles/romanian/1941.txt     |   4 +-
 .../vo-reports/vehicles/romanian/1942.txt     |   4 +-
 .../vo-reports/vehicles/romanian/1943.txt     |   4 +-
 .../vo-reports/vehicles/romanian/1944.txt     |   4 +-
 .../vo-reports/vehicles/romanian/1945.txt     |   4 +-
 .../vo-reports/vehicles/russian/1940.txt      | 192 ++--
 .../vo-reports/vehicles/russian/1941.txt      | 192 ++--
 .../vo-reports/vehicles/russian/1942.txt      | 192 ++--
 .../vo-reports/vehicles/russian/1943.txt      | 192 ++--
 .../vo-reports/vehicles/russian/1944.txt      | 192 ++--
 .../vo-reports/vehicles/russian/1945.txt      | 192 ++--
 .../vo-reports/vehicles/slovakian/1940.txt    |   4 +-
 .../vo-reports/vehicles/slovakian/1941.txt    |   4 +-
 .../vo-reports/vehicles/slovakian/1942.txt    |   4 +-
 .../vo-reports/vehicles/slovakian/1943.txt    |   4 +-
 .../vo-reports/vehicles/slovakian/1944.txt    |   4 +-
 .../vo-reports/vehicles/slovakian/1945.txt    |   4 +-
 .../vo-reports/vehicles/thai/1940.txt         |  10 +
 .../vo-reports/vehicles/thai/1941.txt         |  10 +
 .../vo-reports/vehicles/thai/1942.txt         |  10 +
 .../vo-reports/vehicles/thai/1943.txt         |  10 +
 .../vo-reports/vehicles/thai/1944.txt         |  10 +
 .../vo-reports/vehicles/thai/1945.txt         |  10 +
 .../vo-reports/vehicles/yugoslavian/1940.txt  |   4 +-
 .../vo-reports/vehicles/yugoslavian/1941.txt  |   4 +-
 .../vo-reports/vehicles/yugoslavian/1942.txt  |   4 +-
 .../vo-reports/vehicles/yugoslavian/1943.txt  |   4 +-
 .../vo-reports/vehicles/yugoslavian/1944.txt  |   4 +-
 .../vo-reports/vehicles/yugoslavian/1945.txt  |   4 +-
 .../webapp/tests/test_capabilities.py         | 163 ++-
 .../webapp/tests/test_vasl_extensions.py      | 158 ++-
 .../webapp/tests/test_vehicles_ordnance.py    |   7 +
 vasl_templates/webapp/tests/test_vo_notes.py  |  16 +-
 .../webapp/tests/test_vo_reports.py           |  43 +-
 vasl_templates/webapp/tests/utils.py          |   6 +-
 vasl_templates/webapp/utils.py                |   2 +-
 vasl_templates/webapp/vo.py                   |  57 +-
 vasl_templates/webapp/vo_notes.py             |  38 +-
 374 files changed, 7354 insertions(+), 3402 deletions(-)
 create mode 100644 vasl_templates/webapp/data/extensions/bfp-cobra.json
 create mode 100644 vasl_templates/webapp/data/extensions/bfp-pif.json
 create mode 100644 vasl_templates/webapp/data/extensions/bfp-v403.json
 create mode 100644 vasl_templates/webapp/data/ordnance/chinese~gmd.json
 create mode 100644 vasl_templates/webapp/data/vehicles/chinese~gmd.json
 create mode 100644 vasl_templates/webapp/static/images/flags/anzac.png
 create mode 100644 vasl_templates/webapp/static/images/flags/burmese.png
 rename vasl_templates/webapp/static/images/flags/{chinese-gmd.png => chinese~gmd.png} (100%)
 create mode 100644 vasl_templates/webapp/static/images/flags/filipino.png
 create mode 100644 vasl_templates/webapp/static/images/flags/indonesian.png
 create mode 100644 vasl_templates/webapp/static/images/flags/thai.png
 create mode 100644 vasl_templates/webapp/static/images/spacer.png
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt
 create mode 100644 vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt

diff --git a/vasl_templates/webapp/data/default-template-pack/nationalities.json b/vasl_templates/webapp/data/default-template-pack/nationalities.json
index 402fde0..d2ed6ff 100644
--- a/vasl_templates/webapp/data/default-template-pack/nationalities.json
+++ b/vasl_templates/webapp/data/default-template-pack/nationalities.json
@@ -44,12 +44,17 @@
   "display_name": "Chinese",
   "ob_colors": [ "#d3edfc","#91cdf5", "#e0a22b" ]
 },
+"chinese~gmd": {
+  "display_name": "Chinese GMD",
+  "ob_colors": [ "#d3edfc","#91cdf5", "#e0a22b" ]
+},
 
 "polish": {
   "display_name": "Polish",
-  "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ],
+  "ob_colors": [ "#ecd8b0","#e8cfa4", "#84e8c2" ],
   "type": "allied-minor"
 },
+
 "belgian": {
   "display_name": "Belgian",
   "ob_colors": [ "#a3ecd1","#82e3bd", "#61d8a6" ],
@@ -99,6 +104,27 @@
   "display_name": "Bulgarian",
   "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ],
   "type": "axis-minor"
+},
+
+"anzac": {
+  "display_name": "ANZAC",
+  "ob_colors": [ "#f6edda","#e5cea0", "#e5cea0" ]
+},
+"thai": {
+  "display_name": "Thai",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"indonesian": {
+  "display_name": "Indonesian",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"burmese": {
+  "display_name": "Burmese",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
+},
+"filipino": {
+  "display_name": "Filipino",
+  "ob_colors": [ "#3ceb7c","#1de256", "#0ed93c" ]
 }
 
 }
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2 b/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
index 7418a2f..4fc8f84 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_ordnance.j2
@@ -5,6 +5,7 @@
 <style>
 td { margin: 0 ; padding: 0 ; }
 .note { margin-top: 2px ; font-size: 90% ; font-style: italic ; color: #808080 ; }
+.comment { font-size: 90% ; font-style: italic ; color: #404040 ; }
 sup { font-size: 75% ; }
 </style>
 </head>
@@ -28,6 +29,7 @@ sup { font-size: 75% ; }
     <b> {{ord.name}} </b>
     {%if ord.image%} <br> <img src="{{ord.image}}"> {%endif%}
     <div class="note">
+        {%if ord.extn_id%} &#x2756; {%endif%}
         {%if ord.notes%}
             {{ord.note_number}}, {{ord.notes | join(", ")}}
         {%else%}
@@ -35,7 +37,8 @@ sup { font-size: 75% ; }
         {%endif%}
     </div>
 <td valign="top" style="padding:2px 5px;">
-    {%for cap in ord.capabilities%} <div> {{cap}} </div> {%endfor%}
+    {%for cap in ord.capabilities%} <div class="capability"> {{cap}} </div> {%endfor%}
+    {%for cmnt in ord.comments%} <div class="comment"> {{cmnt}} </div> {%endfor%}
 {%endfor%}
 
 </table>
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2 b/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
index 77f675b..5662bb6 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_ordnance_ma_notes.j2
@@ -4,6 +4,8 @@
 <meta charset="utf-8">
 <style>
 .ma-note .key { font-weight: bold ; }
+.ma-note table { margin-left: 10px ; }
+.ma-note td { padding: 0 ; }
 .extra-notes-caption { border: 1px solid #e0e0e0 ; background: #fcfcfc ; font-weight: bold ; padding: 2px 5px ; }
 ul { margin: 0 0 0 15px ; padding: 0 ; }
 sup { font-size: 75% ; }
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
index f53d4df..fc856d7 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vehicles.j2
@@ -5,6 +5,7 @@
 <style>
 td { margin: 0 ; padding: 0 ; }
 .note { margin-top: 2px ; font-size: 90% ; font-style: italic ; color: #808080 ; }
+.comment { font-size: 90% ; font-style: italic ; color: #404040 ; }
 sup { font-size: 75% ; }
 </style>
 </head>
@@ -28,6 +29,7 @@ sup { font-size: 75% ; }
     <b> {{veh.name}} </b>
     {%if veh.image%} <br> <img src="{{veh.image}}"> {%endif%}
     <div class="note">
+        {%if veh.extn_id%} &#x2756; {%endif%}
         {%if veh.notes%}
             {{veh.note_number}}, {{veh.notes | join(", ")}}
         {%else%}
@@ -35,7 +37,8 @@ sup { font-size: 75% ; }
         {%endif%}
     </div>
 <td valign="top" style="padding:2px 5px;">
-    {%for cap in veh.capabilities%} <div> {{cap}} </div> {%endfor%}
+    {%for cap in veh.capabilities%} <div class="capability"> {{cap}} </div> {%endfor%}
+    {%for cmnt in veh.comments%} <div class="comment"> {{cmnt}} </div> {%endfor%}
 {%endfor%}
 
 </table>
diff --git a/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2 b/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
index d993fb6..bb889c7 100644
--- a/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
+++ b/vasl_templates/webapp/data/default-template-pack/ob_vehicles_ma_notes.j2
@@ -4,6 +4,8 @@
 <meta charset="utf-8">
 <style>
 .ma-note .key { font-weight: bold ; }
+.ma-note table { margin-left: 10px ; }
+.ma-note td { padding: 0 ; }
 .extra-notes-caption { border: 1px solid #e0e0e0 ; background: #fcfcfc ; font-weight: bold ; padding: 2px 5px ; }
 ul { margin: 0 0 0 15px ; padding: 0 ; }
 sup { font-size: 75% ; }
diff --git a/vasl_templates/webapp/data/expected-multiple-images.json b/vasl_templates/webapp/data/expected-multiple-images.json
index 9165c69..fcc9ef1 100644
--- a/vasl_templates/webapp/data/expected-multiple-images.json
+++ b/vasl_templates/webapp/data/expected-multiple-images.json
@@ -10,6 +10,22 @@
     "name": "76* INF FRC",
     "front_images": [ "al/gun/alINF76", "al/gun/alINF76u" ],
     "back_images": "al/gun/alINF76b"
+},
+
+"adf:1828": {
+    "name": "105 ART wz.29",
+    "front_images": "po/gun/poARTwz29-BFP.png",
+    "back_images": [ "po/gun/poARTwz29-BFP.png", "po/gun/poARTwz29-BFPb.png" ]
+},
+"adf:1829": {
+    "name": "120* ART wz09.31",
+    "front_images": "po/gun/poARTwz0931-BFP.png",
+    "back_images": [ "po/gun/poARTwz0931-BFP.png", "po/gun/poARTwz0931-BFPb.png" ]
+},
+"adf:1830": {
+    "name": "155 ART wz.17",
+    "front_images": "po/gun/poARTwz17-BFP.png",
+    "back_images": [ "po/gun/poARTwz17-BFP.png", "po/gun/poARTwz17-BFPb.png" ]
 }
 
 }
diff --git a/vasl_templates/webapp/data/extensions/bfp-cobra.json b/vasl_templates/webapp/data/extensions/bfp-cobra.json
new file mode 100644
index 0000000..6279fe9
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-cobra.json
@@ -0,0 +1,181 @@
+{
+
+"parentExtensionId": "adf",
+"extensionId": "cobra",
+"version": "4.03",
+"id_range": [ 850, 899 ],
+"comment": "These are F (flamethrower) and C (Culin) versions of the same vehicles (from Operation Cobra).",
+
+"american": {
+
+"vehicles": [
+
+{ "name": "M5A1C",
+  "type": "LT",
+  "CS#": 4,
+  "capabilities": [ "C7\u2020<sup>2</sup>" ],
+  "note_number": "5\u2020",
+  "notes": [ "US C\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US N", "US Y", "A", "B" ],
+  "id": "am/v:850",
+  "gpid": "adf:154"
+},
+{ "name": "M4C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "8\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:851",
+  "gpid": "adf:160"
+},
+{ "name": "M4A1C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "9\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US N", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:852",
+  "gpid": "adf:164"
+},
+{ "name": "M4A3C",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [4,"4+"] ] },
+  "note_number": "12\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "A", "B" ],
+  "id": "am/v:853",
+  "gpid": "adf:172"
+},
+{ "name": "M4A3C(75)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "13\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:854",
+  "gpid": "adf:176"
+},
+{ "name": "M4A1C(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "15\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "A", "B" ],
+  "id": "am/v:855",
+  "gpid": "adf:180"
+},
+{ "name": "M4A3C(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "16\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "A", "B" ],
+  "id": "am/v:856",
+  "gpid": "adf:184"
+},
+{ "name": "M4C(105)",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
+  "note_number": "17\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:857",
+  "gpid": "adf:188"
+},
+{ "name": "M4A3C(105)",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "H": 9, "C": [ [7,"P"], "\u2020<sup>1</sup>" ], "s": 7, "WP": 9, "sM": 8 },
+  "note_number": "17\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:858",
+  "gpid": "adf:190"
+},
+{ "name": "M10C GMC",
+  "type": "TD",
+  "CS#": 7,
+  "capabilities2": { "A": [ [5,"A4E"], [6,"5E"], "\u2020<sup>1</sup>" ], "s": [ [5,5] ], "sP": 5 },
+  "note_number": "23\u2020",
+  "notes": [ "US A\u2020<sup>1</sup>", "US N", "US Y", "A", "B" ],
+  "id": "am/v:859",
+  "gpid": "adf:192"
+},
+{ "name": "M8C HMC",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "H": 9, "C": [ [4,"4+"], "\u2020<sup>1</sup>" ], "WP": 9 },
+  "note_number": "43\u2020",
+  "notes": [ "US C\u2020<sup>1</sup>", "US Y", "A", "B" ],
+  "id": "am/v:860",
+  "gpid": "adf:194"
+},
+
+{ "name": "M5A1F",
+  "type": "LT",
+  "CS#": 4,
+  "capabilities": [ "C7\u2020<sup>2</sup>" ],
+  "note_number": "5\u2020",
+  "notes": [ "US C\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US N", "US Y", "C" ],
+  "id": "am/v:870",
+  "gpid": "adf:156"
+},
+{ "name": "M4F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "8\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:871",
+  "gpid": "adf:162"
+},
+{ "name": "M4A1F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [5,"4+"] ] },
+  "note_number": "9\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US N", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:872",
+  "gpid": "adf:166"
+},
+{ "name": "M4A3F",
+  "type": "MT",
+  "CS#": "5:brewup",
+  "capabilities2": { "s": [ [5,"J4+"] ], "WP": [ [7,"J4+"], "\u2020<sup>3</sup>" ], "sM": [ [4,"4+"] ] },
+  "note_number": "12\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "US BB\u2020<sup>3</sup>", "C" ],
+  "id": "am/v:873",
+  "gpid": "adf:174"
+},
+{ "name": "M4A3F(75)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "13\u2020",
+  "notes": [ "US F\u2020<sup>2</sup>", "US G", "US R\u2020<sup>1</sup>", "US Y", "C" ],
+  "id": "am/v:874",
+  "gpid": "adf:178"
+},
+{ "name": "M4A1F(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "15\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "US Y", "C" ],
+  "id": "am/v:875",
+  "gpid": "adf:182"
+},
+{ "name": "M4A3F(76)W",
+  "type": "MT",
+  "CS#": 6,
+  "capabilities2": { "A": [ [4,"A4"], [5,5], "\u2020<sup>2</sup>" ], "s": [ [5,5] ], "sM": 8 },
+  "note_number": "16\u2020",
+  "notes": [ "US A\u2020<sup>2</sup>", "US F\u2020<sup>1</sup>", "US G", "US <s>P</s>", "Y", "C" ],
+  "id": "am/v:876",
+  "gpid": "adf:186"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/bfp-pif.json b/vasl_templates/webapp/data/extensions/bfp-pif.json
new file mode 100644
index 0000000..0916d99
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-pif.json
@@ -0,0 +1,543 @@
+{
+
+"parentExtensionId": "adf",
+"extensionId": "pif",
+"version": "4.03",
+"id_range": [ 800, 849 ],
+
+"polish": {
+
+"vehicles": [
+
+{ "name": "TKS-AA",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020<sup>2</sup>",
+  "notes": [ "A\u2020<sup>1</sup>", "C\u2020", "AllM D" ],
+  "id": "po/v:800",
+  "gpid": "adf:919"
+},
+{ "name": "FT-18C (f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 9, "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "Road Rate NA" ],
+  "note_number": "2\u2020",
+  "notes": [ "B", "D\u2020<sup>1</sup>", "Fr C" ],
+  "id": "po/v:801",
+  "gpid": "adf:907"
+},
+{ "name": "FT-17K (f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 9, "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "Road Rate NA", "+4 ESB" ],
+  "note_number": "3\u2020",
+  "notes": [ "B", "D\u2020<sup>1</sup>", "Fr C" ],
+  "id": "po/v:802",
+  "gpid": "adf:1732"
+},
+{ "name": "TKS-D",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "comments": [ "12: Immob, 11: Stall" ],
+  "note_number": "4",
+  "notes": [ "C\u2020", "AllM D" ],
+  "id": "po/v:803",
+  "gpid": "adf:927"
+},
+{ "name": "TKD",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "C": "5\u2020<sup>1</sup>" },
+  "comments": [ "12: Immob, 11: Stall" ],
+  "note_number": "5\u2020<sup>1</sup>",
+  "notes": [ "C\u2020", "D\u2020<sup>1</sup>", "AllM D" ],
+  "id": "po/v:804",
+  "gpid": "adf:1614"
+},
+{ "name": "H39(f)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "capabilities2": { "AP": 10 },
+  "note_number": "6",
+  "notes": [ "B", "Fr A\u2020", "Fr C" ],
+  "id": "po/v:805",
+  "gpid": "adf:915"
+},
+{ "name": "7TPjw(L)",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "7",
+  "id": "po/v:806",
+  "gpid": "adf:891"
+},
+{ "name": "wz. 34 Half Track",
+  "type": "ht",
+  "cs#": 6,
+  "note_number": "8",
+  "id": "po/v:807",
+  "gpid": "adf:1065"
+},
+{ "name": "wz. 34 C4P",
+  "type": "ht",
+  "cs#": 5,
+  "note_number": "9",
+  "id": "po/v:808",
+  "gpid": "adf:1061"
+},
+{ "name": "PF621L",
+  "type": "tr",
+  "cs#": 6,
+  "note_number": "10",
+  "id": "po/v:809",
+  "gpid": "adf:1053"
+},
+{ "name": "PF621L AAtr",
+  "type": "AAtr",
+  "CS#": 6,
+  "comments": [ "MA: AA" ],
+  "note_number": "11\u2020",
+  "id": "po/v:810",
+  "gpid": "adf:1601"
+},
+{ "name": "Praga RV",
+  "type": "tr",
+  "CS#": 7,
+  "note_number": "12",
+  "id": "po/v:811",
+  "gpid": "adf:1057"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "FK-A wz.38 Autocannon",
+  "type": "AT",
+  "capabilities": [ "T", "QSU" ],
+  "comments": [ "No Gunshield.", "Tow NA\u2020" ],
+  "note_number": "1",
+  "notes": [ "A", "AllM T\u2020" ],
+  "id": "po/o:800",
+  "gpid": "adf:833"
+},
+{ "name": "65mm wz.06",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "C6\u2020", "h-d" ],
+  "comments": [ "No Gunshield." ],
+  "note_number": "2",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:801",
+  "gpid": "adf:861"
+},
+{ "name": "75mm wz.02/26",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 6, "C": "6\u2020" },
+  "note_number": "3",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:802",
+  "gpid": "adf:855"
+},
+{ "name": "75mm wz.97",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "s": 8, "C": "6\u2020" },
+  "note_number": "4",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:803",
+  "gpid": "adf:854"
+},
+{ "name": "75mm wz.28",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 6, "AP": 5, "C": "6\u2020" },
+  "note_number": "5",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:804",
+  "gpid": "adf:854"
+},
+{ "name": "76mm wz.02",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "s": 8, "C": "6\u2020" },
+  "note_number": "6",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:805",
+  "gpid": "adf:856"
+},
+{ "name": "100mm wz.14/19",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "C": "6\u2020" },
+  "note_number": "7",
+  "notes": [ "B\u2020", "AllM A" ],
+  "id": "po/o:806",
+  "gpid": "adf:857"
+},
+{ "name": "100mm wz.29",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "C": "4\u2020" },
+  "note_number": "8",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:807",
+  "gpid": "adf:1828"
+},
+{ "name": "120mm wz.09/31",
+  "type": "ART",
+  "capabilities": [ "NT", "h-d" ],
+  "capabilities2": { "s": 6, "C": "5\u2020" },
+  "note_number": "9",
+  "notes": [ "B\u2020" ],
+  "id": "po/o:808",
+  "gpid": "adf:1829"
+},
+{ "name": "155mm wz.17",
+  "type": "ART",
+  "capabilities": [ "NT" ],
+  "capabilities2": { "s": 8 },
+  "note_number": "10",
+  "id": "po/o:809",
+  "gpid": "adf:1830"
+}
+
+]
+
+},
+
+"german": {
+
+"vehicles": [
+
+{ "name": "PzKpfw IA",
+  "type": "Tt",
+  "CS#": 2,
+  "capabilities2": { "sD": 6 },
+  "comments": [ "2 TK DR (MG)" ],
+  "note_number": "1\u2020",
+  "notes": [ "Ge N" ],
+  "id": "ge/v:800",
+  "gpid": "adf:1464"
+},
+{ "name": "PzKpfw ICV",
+  "type": "Tt",
+  "CS#": 3,
+  "capabilities2": { "sD": 5 },
+  "note_number": "2",
+  "notes": [ "A\u2020" ],
+  "id": "ge/v:801",
+  "gpid": "adf:1460"
+},
+{ "name": "PzKpfw IID",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "sD": 6 },
+  "note_number": "3",
+  "id": "ge/v:802",
+  "gpid": "adf:1468"
+},
+{ "name": "PzKpfw II Bridgelayer",
+  "type": "LTv",
+  "CS#": 2,
+  "capabilities2": { "sD": 6 },
+  "note_number": "4\u2020",
+  "id": "ge/v:803",
+  "gpid": "adf:1833"
+},
+{ "name": "Pz-7TP",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "B\u2020" ],
+  "id": "ge/v:804",
+  "gpid": "adf:1456"
+},
+{ "name": "PSW M35",
+  "type": "AC",
+  "CS#": 5,
+  "comments": [ "REV x2" ],
+  "note_number": "6\u2020",
+  "id": "ge/v:805",
+  "gpid": "adf:1448"
+},
+{ "name": "SdKfz8 FlaK 18",
+  "type": "TDht",
+  "CS#": 6,
+  "capabilities2": { "A": [ [5,2], [4,3] ] },
+  "comments": [ "CE +3 VCA", "MA: Rear VCA NA" ],
+  "note_number": "7\u2020\u2020<sup>1</sup>",
+  "id": "ge/v:806",
+  "gpid": "adf:1472"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "2cm Tankb&uuml;sche S-18",
+  "type": "ATR",
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "No Long Range" ],
+  "note_number": "1\u2020",
+  "notes": [ "AxM A" ],
+  "id": "ge/o:800",
+  "gpid": "adf:1407"
+},
+{ "name": "4.7 cm PaK 36(t)",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "A": [ [5,1], [4,2] ] },
+  "note_number": "2\u2020",
+  "id": "ge/o:801",
+  "gpid": "adf:1480"
+},
+{ "name": "7.5 cm Geb G36",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": "7\u2020" },
+  "note_number": "3\u2020",
+  "notes": [ "Ge O" ],
+  "id": "ge/o:802",
+  "gpid": "adf:1481"
+},
+{ "name": "10.5 cm Geb H40",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 8 },
+  "note_number": "4\u2020",
+  "notes": [ "Ge O" ],
+  "id": "ge/o:803",
+  "gpid": "adf:1482"
+}
+
+]
+
+},
+
+"russian": {
+
+"vehicles": [
+
+{ "name": "BT-2A",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "CMG 2:00 from MA" ],
+  "note_number": "1\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:800",
+  "gpid": "adf:1691"
+},
+{ "name": "BT-2A(L)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "6\u2020<sup>2</sup>" },
+  "note_number": "2\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:801",
+  "gpid": "adf:1720"
+},
+{ "name": "BT-2B",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "comments": [ "2 TK DR (MG)" ],
+  "note_number": "3\u2020",
+  "notes": [ "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:802",
+  "gpid": "adf:1722"
+},
+{ "name": "OT-26",
+  "type": "LTv",
+  "no_radio": "\u00ae",
+  "CS#": "2:brewup",
+  "note_number": "4\u2020<sup>1</sup>",
+  "notes": [ "Ru M\u2020" ],
+  "id": "ru/v:903",
+  "gpid": "adf:1728"
+},
+{ "name": "T-26 M31",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "5\u2020",
+  "notes": [ "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:804",
+  "gpid": "adf:1701"
+},
+{ "name": "T-26 M32",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "6\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:805",
+  "gpid": "adf:1703"
+},
+{ "name": "T-26 M32U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "5\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "7\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:806",
+  "gpid": "adf:1709"
+},
+{ "name": "T-26 M32(L)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd", "MG: Port" ],
+  "note_number": "8\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:807",
+  "gpid": "adf:1707"
+},
+{ "name": "T-26 M32U(L)",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "comments": [ "37*: Stbd MG: Port" ],
+  "note_number": "9\u2020",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:808",
+  "gpid": "adf:1711"
+},
+{ "name": "T-26 M33",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": 5 },
+  "comments": [ "C4 applies if equipped with optional CMG." ],
+  "note_number": "10\u2020<sup>3</sup>",
+  "notes": [ "Ru D\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:809",
+  "gpid": "adf:1713"
+},
+{ "name": "T-26 M33U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>1</sup>" },
+  "note_number": "11",
+  "notes": [ "C\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ru/v:810",
+  "gpid": "adf:1716"
+},
+{ "name": "T-26 M39U",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>1</sup>" },
+  "note_number": "12",
+  "notes": [ "C\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ru/v:811",
+  "gpid": "adf:1718"
+},
+{ "name": "BT-5 M34",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>2</sup>" },
+  "note_number": "13",
+  "notes": [ "C\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:812",
+  "gpid": "adf:1693"
+},
+{ "name": "BT-7 M37",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "C": "4\u2020<sup>3</sup>" },
+  "note_number": "14",
+  "notes": [ "C\u2020<sup>3</sup>", "Ru D\u2020<sup>2</sup>", "Ru I\u2020", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:813",
+  "gpid": "adf:1685"
+},
+{ "name": "T-26A",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>3</sup>", "s": 9 },
+  "note_number": "15\u2020",
+  "notes": [ "B", "C\u2020<sup>3</sup>", "Ru D\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:814",
+  "gpid": "adf:1695"
+},
+{ "name": "BT-7A",
+  "type": "LT",
+  "CS#": 3,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>2</sup>", "s": 9 },
+  "note_number": "16\u2020",
+  "notes": [ "B", "C\u2020<sup>2</sup>", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ru/v:815",
+  "gpid": "adf:1689"
+},
+{ "name": "BA-6",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities2": { "A": [ [4,2], [5,3] ], "C": "4\u2020" },
+  "note_number": "17\u2020",
+  "id": "ru/v:816",
+  "gpid": "adf:1726"
+},
+{ "name": "SU-12",
+  "type": "SPAtr",
+  "CS#": 4,
+  "capabilities2": { "AP": 7, "C": "6\u2020<sup>2</sup>", "s": 8 },
+  "note_number": "18\u2020",
+  "notes": [ "B", "C\u2020<sup>2</sup>", "Ru F\u2020<sup>1</sup>" ],
+  "id": "ru/v:817",
+  "gpid": "adf:1724"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "37mm PTP obr. 30",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "C": "5\u2020" },
+  "note_number": "1",
+  "notes": [ "B\u2020" ],
+  "id": "ru/o:800",
+  "gpid": "adf:1824"
+},
+{ "name": "37mm PP obr. 15R",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "capabilities2": { "C": "5\u2020" },
+  "note_number": "2",
+  "notes": [ "B\u2020" ],
+  "id": "ru/o:801",
+  "gpid": "adf:1822"
+},
+{ "name": "76.2mm PP obr. 27",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "H": 6, "s": 8, "C": "6\u2020" },
+  "note_number": "3",
+  "notes": [ "A", "B\u2020", "Ru A" ],
+  "id": "ru/o:802",
+  "gpid": "adf:1823"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/bfp-v403.json b/vasl_templates/webapp/data/extensions/bfp-v403.json
new file mode 100644
index 0000000..f6953cc
--- /dev/null
+++ b/vasl_templates/webapp/data/extensions/bfp-v403.json
@@ -0,0 +1,938 @@
+{
+
+"extensionId": "adf",
+"version": "4.03",
+"id_range": [ 900, 999 ],
+
+"japanese": {
+
+"vehicles": [
+
+{ "name": "FT-17M Ko(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020",
+  "notes": [ "A", "Fr C", "Ru M\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:900",
+  "gpid": "adf:278"
+},
+{ "name": "FT-17C Ko(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "2\u2020",
+  "notes": [ "A", "B", "Fr C", "Ru M\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:901",
+  "gpid": "adf:280"
+},
+{ "name": "NC-27M Otsu(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "3\u2020",
+  "notes": [ "A", "Fr C", "Ge H\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:902",
+  "gpid": "adf:282"
+},
+{ "name": "NC-27C Otsu(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "4\u2020",
+  "notes": [ "A", "B", "Fr C", "Ge H\u2020" ],
+  "comments": [ "1 MP minimum road movement rate, even if CE." ],
+  "id": "ja/v:903",
+  "gpid": "adf:284"
+},
+{ "name": "Type 88 LAV(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "5",
+  "notes": [ "A", "AllM D", "Ch H\u2020" ] ,
+  "id": "ja/v:904",
+  "gpid": "adf:286"
+},
+{ "name": "VCL(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "6\u2020",
+  "notes": [ "A", "C", "Ru M\u2020<sup>1</sup>" ],
+  "id": "ja/v:905",
+  "gpid": "adf:288"
+},
+{ "name": "Type 98 Ke-Ni",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "7\u2020",
+  "notes": [ "Jp C" ],
+  "id": "ja/v:906",
+  "gpid": "adf:316"
+},
+{ "name": "Type 2 Ke-To",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "8\u2020",
+  "notes": [ "Jp C" ],
+  "id": "ja/v:907",
+  "gpid": "adf:318"
+},
+{ "name": "M3(a)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "9",
+  "notes": [ "A", "B", "C", "Jp A\u2020", "US B\u2020<sup>1</sup>" ],
+  "id": "ja/v:908",
+  "gpid": "adf:320"
+},
+{ "name": "Stuart I(a)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities2": { "sD": 4 },
+  "note_number": "10",
+  "notes": [ "A", "B", "C", "Jp A\u2020" ],
+  "id": "ja/v:909",
+  "gpid": "adf:322"
+},
+{ "name": "Type 97B Shi-Ki",
+  "type": "MT",
+  "CS#": 4,
+  "capabilities2": { "sD": 6 },
+  "note_number": "11\u2020",
+  "comments": [ "Moved/Motion: Fire NA" ],
+  "id": "ja/v:910",
+  "gpid": "adf:324"
+},
+{ "name": "Type 3 Ka-Chi",
+  "type": "MT",
+  "CS#": 5,
+  "capabilities2": { "sD": 5 },
+  "note_number": "12",
+  "notes": [ "Jp 6\u2020" ],
+  "comments": [ "Refer to Japanese Note 6 on Pontoons for amphibious data and wreck." ],
+  "id": "ja/v:911",
+  "gpid": "adf:326"
+},
+{ "name": "Type 3 Ka-Chi (without pontoons)",
+  "type": "MT",
+  "CS#": 5,
+  "capabilities2": { "sD": 5 },
+  "note_number": "12",
+  "notes": [ "Jp 6\u2020" ],
+  "id": "ja/v:912",
+  "gpid": "adf:328"
+},
+{ "name": "Armored Eng Veh SS",
+  "type": "MTv",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "capabilities2": { "sD": 7 },
+  "note_number": "13\u2020",
+  "comments": [ "Has 2 side FT with limited traverse.", "May remove wire as if a Dozer (B24.7)." ],
+  "id": "ja/v:913",
+  "gpid": "adf:331"
+},
+{ "name": "Type 2587(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "14\u2020",
+  "notes": [ "Ch F\u2020" ],
+  "comments": [ "REV x4" ],
+  "id": "ja/v:914",
+  "gpid": "adf:333"
+},
+{ "name": "Marmon-Herrington III(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "15\u2020",
+  "notes": [ "C", "Ch F\u2020" ],
+  "id": "ja/v:915",
+  "gpid": "adf:335"
+},
+{ "name": "Type 1 Ho-Ha",
+  "type": "ht",
+  "CS#": 5,
+  "note_number": "16\u2020",
+  "comments": [ "2MA&amp;2&amp;2" ],
+  "id": "ja/v:916",
+  "gpid": "adf:337"
+},
+{ "name": "M3A1 Scout Car(a)",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "17",
+  "notes": [ "A", "C", "AllM 34\u2020<sup>2</sup>", "Jp A\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ],
+  "id": "ja/v:917",
+  "gpid": "adf:339"
+},
+{ "name": "Carrier A(b)",
+  "type": "APC",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "18",
+  "notes": [ "A", "C", "Br Note 64\u2020" ],
+  "comments": [ "The Inherent Crew is a 2-3-7 HS (D6.82).", "Refer to British Vehicle Note 64 for switching the BMG to an AAMG." ],
+  "id": "ja/v:918",
+  "gpid": "adf:341"
+},
+{ "name": "Type 2 Ho-I",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "WP": 5, "sD": 5 },
+  "note_number": "19",
+  "id": "ja/v:919",
+  "gpid": "adf:343"
+},
+{ "name": "Type 1 Ho-Ni II",
+  "type": "SPA",
+  "CS#": 5,
+  "capabilities2": { "H": 5 },
+  "note_number": "20\u2020",
+  "id": "ja/v:920",
+  "gpid": "adf:345"
+},
+{ "name": "M3 75 SPA(a)",
+  "type": "SPAht",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "21",
+  "notes": [ "B", "C", "US U", "Ru M\u2020" ],
+  "id": "ja/v:921",
+  "gpid": "adf:347"
+},
+{ "name": "Type 97B Chi-Ha",
+  "type": "SPA",
+  "CS#": 4,
+  "capabilities2": { "H": 9 },
+  "note_number": "22",
+  "id": "ja/v:922",
+  "gpid": "adf:349"
+},
+{ "name": "Type 3 Ho-Ni III",
+  "type": "TD",
+  "CS#": 5,
+  "capabilities2": { "WP": 5 },
+  "note_number": "23",
+  "id": "ja/v:923",
+  "gpid": "adf:351"
+},
+{ "name": "Type 97 AA Truck",
+  "type": "AAtr",
+  "CS#": 7,
+  "note_number": "24\u2020",
+  "comments": [ "MA: AA" ],
+  "id": "ja/v:924",
+  "gpid": "adf:353"
+},
+{ "name": "Type 98 MCT",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "25",
+  "notes": [ "Br H", "Ge A\u2020" ],
+  "comments": [ "Bnd FF NA VCA", "MA: AA", "(Un)load: Portee" ],
+  "id": "ja/v:925",
+  "gpid": "adf:355"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Type 45 (1912) 24cm Howitzer",
+  "type": "ART",
+  "capabilities": [ "NT", "NM", "No IF", "HE TK# 23", "Tow NA" ],
+  "note_number": "1\u2020",
+  "notes": [ "Jp D\u2020<sup>1</sup>" ],
+  "id": "ja/o:900",
+  "gpid": "adf:274"
+},
+{ "name": "Type 91 Vickers AA Gun",
+  "type": "AA",
+  "capabilities": [ "AP TK# 8" ],
+  "capabilities2": { "LF": [ "40(4)", "1 ROF", "B10"] },
+  "note_number": "2\u2020",
+  "id": "ja/o:901",
+  "gpid": "adf:275"
+},
+{ "name": "Type 91 Twin-mount Vickers AA Gun",
+  "type": "AA",
+  "capabilities": [ "AP TK# 8", "2 TK DR's\u2020" ],
+  "capabilities2": { "LF": [ "40(8)", "1 ROF", "B10" ] },
+  "note_number": "3\u2020",
+  "id": "ja/o:902",
+  "gpid": "adf:276"
+},
+{ "name": "Type 4 75mm AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP": [ [6,"44-"] ] },
+  "note_number": "4\u2020",
+  "notes": [ "Ch G"],
+  "id": "ja/o:903",
+  "gpid": "adf:277"
+}
+
+]
+
+},
+
+"chinese": {
+
+"vehicles": [
+
+{ "name": "FT-17(f)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1\u2020",
+  "notes": [ "A", "Fr C", "Ru M\u2020" ],
+  "id": "ch/v:900",
+  "gpid": "adf:233"
+},
+{ "name": "Type 94 Lt Armored Vehicle(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "2",
+  "notes": [ "A", "D", "Ru M\u2020" ],
+  "id": "ch/v:901",
+  "gpid": "adf:235"
+},
+{ "name": "Type 97A Te-Ke(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "3",
+  "notes": [ "A", "D" ],
+  "id": "ch/v:902",
+  "gpid": "adf:237"
+},
+{ "name": "Type 97B Te-Ke(j)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "4",
+  "notes": [ "A", "C", "D" ],
+  "id": "ch/v:903",
+  "gpid": "adf:239"
+},
+{ "name": "Type 95 Ha-Go(j)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "A", "B\u2020", "C", "D", "Jp 5\u2020<sup>1</sup>" ],
+  "id": "ch/v:904",
+  "gpid": "adf:241"
+},
+{ "name": "BT-5(r)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "6",
+  "notes": [ "A", "B\u2020<sup>1</sup>", "Ru M\u2020" ],
+  "id": "ch/v:905",
+  "gpid": "adf:243"
+},
+{ "name": "Type 89A Chi-Ro(j)",
+  "type": "MT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "7",
+  "notes": [ "A", "B\u2020", "C", "D" ],
+  "id": "ch/v:906",
+  "gpid": "adf:245"
+},
+{ "name": "Type 97A Chi-Ha(j)",
+  "type": "MT",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "8",
+  "notes": [ "A", "B\u2020", "C", "D" ],
+  "id": "ch/v:907",
+  "gpid": "adf:247"
+},
+{ "name": "Type 31 Armored Car",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "9\u2020",
+  "notes": [ "B\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "id": "ch/v:908",
+  "gpid": "adf:249"
+}
+
+]
+
+},
+
+"dutch": {
+
+"vehicles": [
+
+{ "name": "Alvis-Straussler AC3D",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "1\u2020<sup>2</sup>",
+  "notes": [ "AllM V\u2020", "Ch F\u2020<sup>1</sup>" ],
+  "comments": [ "CMG uses AP TK 12.7 column." ],
+  "id": "du/v:900",
+  "gpid": "adf:10"
+},
+{ "name": "Braat Overvalwagen APC",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 5,
+  "note_number": "2\u2020<sup>2</sup>",
+  "notes": [ "A\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ],
+  "id": "du/v:901",
+  "gpid": "adf:12"
+},
+{ "name": "Braat Overvalwagen AA",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "3\u2020<sup>1</sup>",
+  "notes": [ "AllM AA\u2020<sup>2</sup>", "Ch F\u2020" ],
+  "comments": [ "AAMG uses AP TK 12.7 column." ],
+  "id": "du/v:902",
+  "gpid": "adf:14"
+},
+{ "name": "Kanonwagen Armored Car",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "4\u2020\u2020<sup>1</sup>",
+  "notes": [ "A\u2020<sup>2</sup>", "AllM V\u2020", "Ch F\u2020<sup>1</sup>" ],
+  "comments": [ "VCA MA: VCA &le; level NA", "CMG may only fire within VCA.", "Rear turret is unarmored when TCA = VCA." ],
+  "id": "du/v:903",
+  "gpid": "adf:16"
+},
+{ "name": "Stadswacht Overvalwagen APC",
+  "type": "AC",
+  "CS#": 6,
+  "note_number": "5\u2020<sup>1</sup>",
+  "notes": [ "Ch F\u2020" ],
+  "comments": [ "Mounted Fire: Full FP", "Passengers may fire 2 LMG's without losing inherent FP." ],
+  "id": "du/v:904",
+  "gpid": "adf:18"
+},
+{ "name": "PLA Wagen",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "6\u2020",
+  "notes": [ "AllM AA\u2020<sup>1</sup>" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "du/v:905",
+  "gpid": "adf:20"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Brandt 47mm Mortar",
+  "type": "MTR",
+  "note_number": "1",
+  "id": "du/o:900",
+  "gpid": "adf:1948"
+},
+{ "name": "Krupp 75mm M1933 Field Gun",
+  "type": "ART",
+  "capabilities": [ "NT", "QSU" ],
+  "capabilities2": { "C": "4\u2020" },
+  "note_number": "2",
+  "notes": [ "US C\u2020" ],
+  "id": "du/o:901",
+  "gpid": "adf:5"
+},
+{ "name": "Bofors 105mm M1924 Howitzer",
+  "type": "ART",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "NT", "B11" ] },
+  "note_number": "3",
+  "id": "du/o:902",
+  "gpid": "adf:6"
+},
+{ "name": "20mm Rheinmetall AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "20\u2020", "2 ROF", "B11", "NT" ] },
+  "note_number": "4",
+  "notes": [ "Gr C\u2020" ],
+  "id": "du/o:903",
+  "gpid": "adf:7"
+},
+{ "name": "Bofors 80mm M29/38",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "80\u2020", "1 ROF", "B11" ] },
+  "capabilities_other": [ "AP TK# 17" ],
+  "note_number": "6",
+  "notes": [ "AxM G\u2020" ],
+  "id": "du/o:904",
+  "gpid": "adf:9"
+}
+
+]
+
+},
+
+"thai": {
+
+"vehicles": [
+
+{ "name": "VCL Mk VI(b)",
+  "type": "Tt",
+  "no_radio": "\u00ae",
+  "CS#": 2,
+  "note_number": "1",
+  "notes": [ "A", "Ch H", "AllM D" ],
+  "id": "th/v:900",
+  "gpid": "adf:92"
+},
+{ "name": "Vickers 6-Ton MkE-B(b)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "2",
+  "notes": [ "A" ],
+  "id": "th/v:901",
+  "gpid": "adf:94"
+},
+{ "name": "Type 83(j)",
+  "type": "LT",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "note_number": "3",
+  "notes": [ "A", "E\u2020" ],
+  "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ],
+  "id": "th/v:902",
+  "gpid": "adf:96"
+},
+{ "name": "Vickers 6-Ton AA(b)",
+  "type": "SPAA",
+  "no_radio": "\u00ae",
+  "CS#": 3,
+  "capabilities": [ "AP TK# 8" ],
+  "note_number": "4",
+  "notes": [ "A", "AllM AA\u2020" ],
+  "id": "th/v:903",
+  "gpid": "adf:98"
+},
+{ "name": "Citroen-Kegresse P17(f)",
+  "type": "ht",
+  "CS#": 3,
+  "note_number": "5\u2020",
+  "notes": [ "A" ],
+  "id": "th/v:904",
+  "gpid": "adf:100"
+},
+{ "name": "Vickers Morris M1930(b)",
+  "type": "AC",
+  "no_radio": "\u00ae",
+  "CS#": 4,
+  "note_number": "6",
+  "notes": [ "Br X\u2020", "Ch F\u2020" ],
+  "comments": [ "REV x4" ],
+  "id": "th/v:905",
+  "gpid": "adf:102"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "50mm Krupp M1906",
+  "type": "INF",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
+  "note_number": "4",
+  "id": "th/o:900",
+  "gpid": "adf:81"
+},
+{ "name": "75mm Krupp M1908",
+  "type": "INF",
+  "capabilities": [ "NT",  "QSU", "h-d" ],
+  "capabilities2": { "AP": 8, "WP": 5 },
+  "note_number": "5",
+  "id": "th/o:901",
+  "gpid": "adf:82"
+},
+{ "name": "Vickers 12.7mm AA Class D",
+  "type": "AA",
+  "capabilities": [ "T",  "QSU" ],
+  "note_number": "8",
+  "id": "th/o:902",
+  "gpid": "adf:85"
+},
+{ "name": "Bofors M30 75mm AA",
+  "type": "AA",
+  "capabilities": [ "T" ],
+  "capabilities2": { "LF": [ "75", "1 ROF", "B11" ], "AP":6 },
+  "note_number": "9",
+  "notes": [ "Ch G\u2020"],
+  "id": "th/o:902",
+  "gpid": "adf:86"
+}
+
+]
+
+},
+
+"indonesian": {
+
+"vehicles": [
+
+{ "name": "Type 94 Light Armoured Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "1",
+  "notes": [ "C", "Ru M\u2020" ],
+  "id": "ina/v:900",
+  "gpid": "adf:123"
+},
+{ "name": "Type 97A Te-Ke Light Armored Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "2",
+  "notes": [ "C" ],
+  "id": "ina/v:901",
+  "gpid": "adf:125"
+},
+{ "name": "Type 97B Te-Ke Light Armored Vehicle (j)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "3",
+  "notes": [ "C" ],
+  "id": "ina/v:902",
+  "gpid": "adf:127"
+},
+{ "name": "Universal Carrier (b)",
+  "type": "Tt",
+  "CS#": 3,
+  "note_number": "4",
+  "notes": [ "C" ],
+  "id": "ina/v:903",
+  "gpid": "adf:129"
+},
+{ "name": "Type 95 Ha-Go(j)",
+  "type": "LT",
+  "CS#": 3,
+  "note_number": "5",
+  "notes": [ "B", "C", "D\u2020", "E\u2020<sup>1</sup>" ],
+  "comments": [ "Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions." ],
+  "id": "ina/v:904",
+  "gpid": "adf:131"
+},
+{ "name": "VCL M1936 (b)",
+  "type": "aTt",
+  "CS#": 2,
+  "note_number": "6",
+  "notes": [ "C" ],
+  "id": "ina/v:905",
+  "gpid": "adf:133"
+},
+{ "name": "CTLS-4 (a)",
+  "type": "Tt",
+  "CS#": 2,
+  "note_number": "7",
+  "notes": [ "C", "Ru M\u2020", "AllM 26\u2020<sup>1</sup>" ],
+  "comments": [ "Port VCA NA (see Allied Minor Vehicle Note 26)." ],
+  "id": "ina/v:906",
+  "gpid": "adf:135"
+},
+{ "name": "Marmon-Herrington III Armored Car (b)",
+  "type": "AC",
+  "CS#": 4,
+  "capabilities": [ "2 TK DR's\u2020" ],
+  "note_number": "8",
+  "notes": [ "Ch F\u2020" ],
+  "id": "ina/v:907",
+  "gpid": "adf:137"
+},
+{ "name": "M3A1 Scout Car (a)",
+  "type": "SC",
+  "CS#": 4,
+  "note_number": "8",
+  "capabilities_other": [ "9PP" ],
+  "note_number": "9\u2020",
+  "notes": [ "D\u2020<sup>1</sup>", "AllM 34\u2020<sup>2</sup>" ],
+  "comments": [ "AP TK: use 12.7 column.", "Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS]." ],
+  "id": "ina/v:908",
+  "gpid": "adf:139"
+},
+{ "name": "Braat Overvalwagen AA",
+  "type": "AC",
+  "CS#": 4,
+  "note_number": "8",
+  "note_number": "10\u2020<sup>1</sup>",
+  "notes": [ "Ch F\u2020", "AllM AA\u2020<sup>1</sup>" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:909",
+  "gpid": "adf:14"
+},
+{ "name": "Braat Overvalwagen APC",
+  "type": "AC",
+  "CS#": 5,
+  "note_number": "8",
+  "capabilities_other": [ "12PP" ],
+  "note_number": "11\u2020<sup>2</sup>",
+  "notes": [ "D\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "CMG: VCA only", "Mounted Fire: Full FP" ],
+  "id": "ina/v:910",
+  "gpid": "adf:12"
+},
+{ "name": "Alvis-Straussler AC3D",
+  "type": "AC",
+  "CS#": 4,
+  "note_number": "8",
+  "note_number": "12\u2020<sup>1</sup>",
+  "notes": [ "D\u2020<sup>2</sup>", "Ru M\u2020" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:911",
+  "gpid": "adf:10"
+},
+{ "name": "PLA Wagen",
+  "type": "AAtr",
+  "CS#": 5,
+  "note_number": "13\u2020<sup>1</sup>",
+  "notes": [ "AllM AA\u2020<sup>1</sup>", "Ch F\u2020" ],
+  "comments": [ "AP TK: use 12.7 column." ],
+  "id": "ina/v:912",
+  "gpid": "adf:147"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "Type 89 Heavy Grenade Launcher",
+  "type": "MTR",
+  "capabilities2": { "WP": [ [5,5] ], "S": [ [6,5] ] },
+  "capabilities_other": [ "4PP" ],
+  "note_number": "1",
+  "id": "ina/o:900",
+  "gpid": "adf:75"
+},
+{ "name": "Type 97 Automatic Gun",
+  "type": "ATR",
+  "capabilities": [ "Long Range is NA" ],
+  "capabilities_other": [ "5PP" ],
+  "note_number": "2",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:901",
+  "gpid": "adf:77"
+},
+{ "name": "Year-11 Flat-Trajectory INF Gun",
+  "type": "INF",
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "note_number": "3",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:902",
+  "gpid": "adf:76"
+},
+{ "name": "Type 94 Rapid-Fire Gun",
+  "type": "AT",
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "note_number": "4",
+  "notes": [ "Jp A" ],
+  "id": "ina/o:903",
+  "gpid": "adf:87"
+},
+{ "name": "Type 1 Machine-Moved Gun",
+  "type": "AT",
+  "capabilities_other": [ "NT", "QSU" ],
+  "note_number": "5",
+  "id": "ina/o:904",
+  "gpid": "adf:88"
+},
+{ "name": "Year-38 Type Field Gun (Improved)",
+  "type": "ART",
+  "capabilities2": { "WP": [ [5,5] ] },
+  "capabilities_other": [ "NT", "QSU", "h-d", "AP TK#12" ],
+  "note_number": "6",
+  "id": "ina/o:905",
+  "gpid": "adf:89"
+}
+
+]
+
+},
+
+"anzac": {
+
+"vehicles": [
+
+{ "name": "Matilda Frog",
+  "type": "HTv",
+  "CS#": 5,
+  "capabilities2": { "sD": "6" },
+  "note_number": "1\u2020",
+  "id": "anz/v:900",
+  "gpid": "adf:211"
+},
+{ "name": "Matilda II(L)",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "sD": "6" },
+  "note_number": "2\u2020",
+  "notes": [ "Br B\u2020<sup>1</sup>" ],
+  "id": "anz/v:901",
+  "gpid": [ "adf:213", "adf:215" ]
+},
+{ "name": "Matilda II CS(L)",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "s": "9", "sD": "6" },
+  "note_number": "3\u2020",
+  "notes": [ "Br S\u2020<sup>1</sup>" ],
+  "id": "anz/v:902",
+  "gpid": [ "adf:217", "adf:219" ]
+},
+{ "name": "Valentine III CS",
+  "type": "HT",
+  "CS#": 5,
+  "capabilities2": { "s": "9", "sM": "8" },
+  "note_number": "4\u2020",
+  "notes": [ "Br S\u2020<sup>1</sup>" ],
+  "id": "anz/v:903",
+  "gpid": "adf:221"
+}
+
+]
+
+},
+
+"american": {
+
+"vehicles": [
+
+{ "name": "LVT(A)1(L)",
+  "type": "aLT",
+  "CS#": 6,
+  "capabilities2": { "C": [ [10,"P"], "\u2020<sup>2</sup>" ] },
+  "note_number": "1",
+  "notes": [ "US 46\u2020<sup>3</sup>", "C\u2020<sup>2</sup>", "G", "H", "P", "T\u2020", "X" ],
+  "comments": [ "Refer to U.S. Vehicle Note 46 and diagram for the AAMG." ],
+  "id": "am/v:900",
+  "gpid": "adf:196"
+},
+{ "name": "LVT(A)2F",
+  "type": "aAPCv",
+  "CS#": 7,
+  "note_number": "2",
+  "notes": [ "US H", "P", "Q\u2020<sup>1</sup>", "T\u2020<sup>1</sup>"],
+  "id": "am/v:901",
+  "gpid": "adf:198"
+},
+{ "name": "LVT4F",
+  "type": "aAPCv",
+  "cs#": 7,
+  "note_number": "3\u2020<sup>2</sup>",
+  "notes": [ "US 51\u2020", "D\u2020<sup>3</sup>", "H", "P", "T\u2020<sup>1</sup>"],
+  "id": "am/v:902",
+  "gpid": "adf:200"
+},
+{ "name": "LVT(A)2FS",
+  "type": "aAPCv",
+  "CS#": 7,
+  "note_number": "4\u2020<sup>1</sup>",
+  "notes": [ "US D\u2020<sup>2</sup>", "H", "P", "T\u2020"],
+  "id": "am/v:903",
+  "gpid": "adf:202"
+},
+{ "name": "LVT4(L)",
+  "type": "aAPC",
+  "CS#": 7,
+  "note_number": "5",
+  "notes": [ "US 51\u2020", "D\u2020<sup>4</sup>", "H", "Q\u2020<sup>3</sup>", "T\u2020<sup>1</sup>", "X\u2020<sup>2</sup>"],
+  "id": "am/v:904",
+  "gpid": "adf:205"
+},
+{ "name": "LVT(A)4(L)",
+  "type": "aLT",
+  "CS#": 6,
+  "capabilities2": { "C": [ [7,"P"], "\u2020<sup>3</sup>" ], "H": 8, "WP": 9 },
+  "note_number": "6",
+  "notes": [ "US 46\u2020<sup>2</sup>", "C\u2020<sup>3</sup>", "G", "H", "P", "T\u2020", "X\u2020<sup>1</sup>"],
+  "id": "am/v:905",
+  "gpid": "adf:207"
+},
+{ "name": "M3A1F",
+  "type": "LTv",
+  "CS#": 4,
+  "capabilities2": { "C": [ [7,"P"], "\u2020" ] },
+  "note_number": "7",
+  "notes": [ "US C\u2020", "G", "P" ],
+  "id": "am/v:906",
+  "gpid": "adf:152"
+},
+{ "name": "M5A1 Satan",
+  "CS#": 4,
+  "note_number": "8\u2020",
+  "notes": [ "US P" ],
+  "id": "am/v:907",
+  "gpid": "adf:158"
+},
+{ "name": "M4A2F",
+  "type": "MTv",
+  "cs#": 5,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 5 },
+  "note_number": "9",
+  "notes": [ "US G", "P", "R" ],
+  "id": "am/v:908",
+  "gpid": "adf:168"
+},
+{ "name": "M4A2(L)F",
+  "type": "MTv",
+  "cs#": 6,
+  "capabilities2": { "s": 5, "WP": 7, "sM": 8 },
+  "note_number": "10",
+  "notes": [ "US G", "P", "R" ],
+  "id": "am/v:909",
+  "gpid": "adf:170"
+},
+{ "name": "Carrier .50cal(b)",
+  "type": "APC",
+  "CS#": 3,
+  "note_number": "11\u2020",
+  "id": "am/v:910",
+  "gpid": "adf:209"
+}
+
+],
+
+"ordnance": [
+
+{ "name": "20mm Oerlikon Mk4",
+  "type": "AA",
+  "capabilities": [ "T", "2 TK DR's\u2020" ],
+  "comments": [ "Multiple Hits (C3.8) are NA." ],
+  "note_number": "1\u2020",
+  "notes": [ "US P" ],
+  "id": "am/o:900",
+  "gpid": "adf:34"
+}
+
+]
+
+}
+
+}
diff --git a/vasl_templates/webapp/data/extensions/kgs-v1.1.json b/vasl_templates/webapp/data/extensions/kgs-v1.1.json
index bd795bf..0dfb87c 100644
--- a/vasl_templates/webapp/data/extensions/kgs-v1.1.json
+++ b/vasl_templates/webapp/data/extensions/kgs-v1.1.json
@@ -3,6 +3,8 @@
 "extensionId": "f97",
 "version": "v1.1",
 
+"russian": {
+
 "vehicles": [
 
 {
@@ -19,3 +21,5 @@
 ]
 
 }
+
+}
diff --git a/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json b/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
index 7a2931c..a4acfd0 100644
--- a/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/belgian.json
@@ -2,7 +2,8 @@
 
 { "name": "DBT",
   "type": "MTR",
-  "capabilities_other": [ "3PP", "\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "\u2020" ],
   "note_number": "6\u2020",
   "notes": [ "A", "B", "D" ],
   "id": "be/o:000",
@@ -29,7 +30,7 @@
 { "name": "7.6cm FRC",
   "type": "INF",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "\u2020" ],
+  "comments": [ "\u2020" ],
   "note_number": "8\u2020",
   "notes": [ "A", "B" ],
   "id": "be/o:003",
diff --git a/vasl_templates/webapp/data/ordnance/allied-minor/common.json b/vasl_templates/webapp/data/ordnance/allied-minor/common.json
index 57d05de..d75a07e 100644
--- a/vasl_templates/webapp/data/ordnance/allied-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/allied-minor/common.json
@@ -35,7 +35,8 @@
 },
 { "name": "65mm wz.06",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "27\u2020",
   "notes": [ "A", "Gr", "P", "Y" ],
   "id": "alc/o:004",
@@ -95,7 +96,8 @@
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
   "type": "AA",
-  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "34\u2020",
   "notes": [ "T\u2020<sup>1</sup>", "B", "Gr", "Y" ],
   "id": "alc/o:011",
diff --git a/vasl_templates/webapp/data/ordnance/american.json b/vasl_templates/webapp/data/ordnance/american.json
index 1625fb1..7a881fb 100644
--- a/vasl_templates/webapp/data/ordnance/american.json
+++ b/vasl_templates/webapp/data/ordnance/american.json
@@ -162,8 +162,9 @@
 },
 { "name": "M1918M1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>", "no IF" ],
+  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>" ],
   "capabilities2": { "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "19\u2020",
   "notes": [ "A\u2020<sup>1</sup>", "N" ],
   "id": "am/o:018",
@@ -171,8 +172,9 @@
 },
 { "name": "M1A1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>", "no IF" ],
+  "capabilities": [ "NT", "RFNM", "AP4\u2020<sup>1</sup>" ],
   "capabilities2": { "s": [ [7,5] ], "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "20\u2020",
   "notes": [ "A\u2020<sup>1</sup>" ],
   "id": "am/o:019",
@@ -180,7 +182,8 @@
 },
 { "name": "M1 8-in. Howitzer",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "21\u2020",
   "id": "am/o:020",
   "gpid": 898
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
index 328c718..d0a54fe 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/bulgarian.json
@@ -10,8 +10,9 @@
 },
 { "name": "Madsen M-35",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities_other": [ "R2", "IFE=B10\u2020" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "38\u2020",
   "notes": [ "T\u2020<sup>1</sup>" ],
   "id": "bu/o:001",
@@ -58,7 +59,8 @@
 },
 { "name": "D/30 Krupp",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "43",
   "id": "bu/o:007",
   "gpid": 3781
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/common.json b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
index bb01bb4..4ae99ca 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/common.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/common.json
@@ -70,7 +70,8 @@
 },
 { "name": "Bohler M35",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "52\u2020",
   "notes": [ "A", "R", "H", "S" ],
   "id": "axc/o:008",
@@ -200,8 +201,9 @@
 },
 { "name": "Skoda M15/16",
   "type": "ART",
-  "capabilities": [ "NT", "no IF" ],
+  "capabilities": [ "NT" ],
   "capabilities2": { "s": 6 },
+  "comments": [ "No IF." ],
   "note_number": "67\u2020",
   "notes": [ "S", "C" ],
   "id": "axc/o:023",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
index 75b2baf..5219b73 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/croatian.json
@@ -2,7 +2,8 @@
 
 { "name": "Canonne da 65/17",
   "type": "INF",
-  "capabilities": [ "NT", "no Gunshield" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "35",
   "notes": [ "A" ],
   "id": "cr/o:000",
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json b/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
index b4d60f4..5681662 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/romanian.json
@@ -27,7 +27,8 @@
 { "name": "Resita M43",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "Blk TH", "AP TK#18\u2020" ],
+  "capabilities_other": [ "AP TK#18\u2020" ],
+  "comments": [ "Blk TH" ],
   "note_number": "4\u2020",
   "id": "ro/o:003",
   "gpid": 3742
@@ -43,7 +44,8 @@
 },
 { "name": "Breda 47",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "6\u2020",
   "notes": [ "A" ],
   "id": "ro/o:005",
@@ -142,8 +144,9 @@
 },
 { "name": "Skoda M28 NOa",
   "type": "ART",
-  "capabilities": [ "NM", "no IF" ],
+  "capabilities": [ "NM" ],
   "capabilities_other": [ "ST" ],
+  "comments": [ "No IF." ],
   "note_number": "18",
   "id": "ro/o:017",
   "gpid": 3756
diff --git a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
index 95f4fa0..63d34ae 100644
--- a/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
+++ b/vasl_templates/webapp/data/ordnance/axis-minor/slovakian.json
@@ -37,7 +37,7 @@
 { "name": "Skoda 47L40(t)",
   "type": "AA",
   "capabilities": [ "T", "QSU" ],
-  "capabilities_other": [ "AA Fire ROF 2\u2020" ],
+  "comments": [ "AA Fire ROF 2\u2020" ],
   "note_number": "32\u2020",
   "notes": [ "E" ],
   "id": "sl/o:004",
diff --git a/vasl_templates/webapp/data/ordnance/british.json b/vasl_templates/webapp/data/ordnance/british.json
index f436dd4..a2c21ed 100644
--- a/vasl_templates/webapp/data/ordnance/british.json
+++ b/vasl_templates/webapp/data/ordnance/british.json
@@ -31,7 +31,7 @@
   "type": "MTR",
   "capabilities": [ "NT" ],
   "capabilities2": { "s": 8, "WP": 7 },
-  "capabilities_other": [ "Towed\u2020" ],
+  "comments": [ "Towed\u2020" ],
   "note_number": "3\u2020",
   "notes": [ "N", "P" ],
   "id": "br/o:003",
@@ -168,8 +168,8 @@
 },
 { "name": "OBL 7.2-in. Howitzer Mk I",
   "type": "ART",
-  "capabilities": [ "NT", "no IF" ],
-  "capabilities_other": [ "Acq. NA\u2020" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No IF.", "Acq. NA\u2020" ],
   "note_number": "18\u2020",
   "notes": [ "N", "P" ],
   "id": "br/o:019",
@@ -177,7 +177,8 @@
 },
 { "name": "OBL 7.2-in. Howitzer Mk VI",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "19\u2020",
   "notes": [ "P" ],
   "id": "br/o:020",
diff --git a/vasl_templates/webapp/data/ordnance/chinese.json b/vasl_templates/webapp/data/ordnance/chinese.json
index 047415a..607a449 100644
--- a/vasl_templates/webapp/data/ordnance/chinese.json
+++ b/vasl_templates/webapp/data/ordnance/chinese.json
@@ -2,7 +2,8 @@
 
 { "name": "Type 27 Grenade Launcher",
   "type": "MTR",
-  "capabilities_other": [ "2PP", "Air Bursts NA\u2020" ],
+  "capabilities_other": [ "2PP" ],
+  "comments": [ "Air Bursts NA\u2020" ],
   "note_number": "1\u2020",
   "notes": [ "A" ],
   "id": "ch/o:000",
@@ -115,7 +116,7 @@
 { "name": "37mm PP obr. 15R",
   "type": "ART",
   "capabilities": [ "NT", "QSU", "h-d" ],
-  "capabilities_other": [ "Low Ammo\u2020" ],
+  "comments": [ "Low Ammo\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "<s>B</s>" ],
   "id": "ch/o:013",
@@ -123,7 +124,8 @@
 },
 { "name": "Cannone da 70/15",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "Acq. NA\u2020", "Low Ammo\u2020", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "Acq. NA\u2020", "Low Ammo\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "A", "<s>B</s>" ],
   "id": "ch/o:014",
diff --git a/vasl_templates/webapp/data/ordnance/chinese~gmd.json b/vasl_templates/webapp/data/ordnance/chinese~gmd.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/vasl_templates/webapp/data/ordnance/chinese~gmd.json
@@ -0,0 +1 @@
+[]
diff --git a/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json b/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
index a47726e..27d40ad 100644
--- a/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
+++ b/vasl_templates/webapp/data/ordnance/communist-forces/cvpa.json
@@ -81,7 +81,8 @@
 { "name": "57mm Type 36 Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 6, "WP": 5 },
-  "capabilities_other": [ "3PP", "crewed\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "26\u2020<sup>1</sup>",
   "notes": [ "R\u2020" ],
   "id": "cvpa/o:010",
@@ -90,7 +91,8 @@
 { "name": "75mm Type 52 Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 6, "WP": 5 },
-  "capabilities_other": [ "5PP", "crewed\u2020" ],
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "27",
   "notes": [ "R\u2020" ],
   "id": "cvpa/o:011",
@@ -133,7 +135,8 @@
 { "name": "Type 93 Twin-Mount High-Angle Machine Gun",
   "type": "AA",
   "capabilities": [ "T" ],
-  "capabilities_other": [ "2 TK DR\u2020", "Towing NA\u2020" ],
+  "capabilities_other": [ "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020" ],
   "note_number": "32\u2020",
   "notes": [ "A" ],
   "id": "cvpa/o:016",
diff --git a/vasl_templates/webapp/data/ordnance/finnish.json b/vasl_templates/webapp/data/ordnance/finnish.json
index ef66d2c..834b9f0 100644
--- a/vasl_templates/webapp/data/ordnance/finnish.json
+++ b/vasl_templates/webapp/data/ordnance/finnish.json
@@ -45,14 +45,16 @@
 },
 { "name": "Boys ATR(b)",
   "type": "ATR",
-  "capabilities_other": [ "1PP", "\"British\"\u2020" ],
+  "capabilities_other": [ "1PP" ],
+  "comments": [ "\"British\"\u2020" ],
   "note_number": "6\u2020",
   "id": "fi/o:005",
   "gpid": null
 },
 { "name": "Lahti ATR",
   "type": "ATR",
-  "capabilities_other": [ "4PP", "Light AA fire in 44+\u2020", "B30.35\u2020" ],
+  "capabilities_other": [ "4PP", "B30.35\u2020" ],
+  "comments": [ "Light AA fire in 44+\u2020" ],
   "note_number": "7\u2020",
   "notes": [ "A" ],
   "id": "fi/o:006",
@@ -60,8 +62,9 @@
 },
 { "name": "20 PstK/40",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities_other": [ "R2", "IFE=B10" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "8\u2020",
   "notes": [ "C\u2020<sup>1</sup>" ],
   "id": "fi/o:007",
@@ -174,8 +177,8 @@
 },
 { "name": "87 K/95",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "no IF", "h-d" ],
-  "capabilities_other": [ "Acq. NA\u2020" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020" ],
   "note_number": "21",
   "notes": [ "F\u2020" ],
   "id": "fi/o:020",
@@ -183,7 +186,8 @@
 },
 { "name": "90 K/77",
   "type": "ART",
-  "capabilities": [ "NT", "QSU", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "22\u2020",
   "notes": [ "F\u2020<sup>1</sup>" ],
   "id": "fi/o:021",
@@ -225,7 +229,8 @@
 },
 { "name": "107 K/77(r)",
   "type": "ART",
-  "capabilities": [ "NT", "no IF", "Acq. NA\u2020<sup>1</sup>", "h-d" ],
+  "capabilities": [ "NT", "h-d" ],
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "27\u2020",
   "notes": [ "B", "F\u2020<sup>1</sup>" ],
   "id": "fi/o:026",
@@ -268,8 +273,9 @@
 },
 { "name": "7.62 ItKK/31-40",
   "type": "AA",
-  "capabilities": [ "T", "QSU", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "QSU" ],
   "capabilities_other": [ "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "32\u2020",
   "notes": [ "C\u2020<sup>1</sup>" ],
   "id": "fi/o:031",
@@ -297,7 +303,7 @@
   "type": "AA",
   "capabilities": [ "T" ],
   "capabilities2": { "LF": [ "NT", "20\u2020<sup>1</sup>", "2 ROF" ] },
-  "capabilities_other": [ "Road MP = 1\u2020" ],
+  "comments": [ "Road MP = 1\u2020" ],
   "note_number": "35\u2020",
   "notes": [ "A", "D", "G\u2020<sup>1</sup>" ],
   "id": "fi/o:034",
diff --git a/vasl_templates/webapp/data/ordnance/french.json b/vasl_templates/webapp/data/ordnance/french.json
index 960108a..879185d 100644
--- a/vasl_templates/webapp/data/ordnance/french.json
+++ b/vasl_templates/webapp/data/ordnance/french.json
@@ -2,7 +2,8 @@
 
 { "name": "LG de 50 mle 37(f)",
   "type": "MTR",
-  "capabilities_other": [ "2PP", "crewed\u2020" ],
+  "capabilities_other": [ "2PP" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "1",
   "notes": [ "A", "B", "C\u2020", "E" ],
   "id": "fr/o:000",
@@ -54,7 +55,8 @@
   "type": "AT",
   "capabilities": [ "h-d" ],
   "capabilities2": { "LF": [ "NT" ], "HE": 7, "s": 6 },
-  "capabilities_other": [ "ST", "no shield" ],
+  "capabilities_other": [ "ST" ],
+  "comments": [ "no shield" ],
   "note_number": "7",
   "notes": [ "E" ],
   "id": "fr/o:006",
@@ -62,7 +64,8 @@
 },
 { "name": "Canon de 37 mle 16 TR",
   "type": "INF",
-  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "8\u2020<sup>1</sup>",
   "notes": [ "A", "C\u2020" ],
   "id": "fr/o:007",
@@ -70,7 +73,8 @@
 },
 { "name": "Canon de 65 M mle 06",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "No Gunshield." ],
   "note_number": "9\u2020",
   "notes": [ "A", "P" ],
   "id": "fr/o:008",
@@ -136,14 +140,16 @@
 },
 { "name": "Canon de 155 GPF",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "17\u2020",
   "id": "fr/o:016",
   "gpid": 1685
 },
 { "name": "Mitrailleuse de 13.2 CAJ mle 30",
   "type": "AA",
-  "capabilities": [ "T", "2 TK DR\u2020<sup>1</sup>", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "2 TK DR\u2020<sup>1</sup>" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "18\u2020<sup>1</sup>",
   "notes": [ "B", "G\u2020", "V" ],
   "id": "fr/o:017",
diff --git a/vasl_templates/webapp/data/ordnance/german.json b/vasl_templates/webapp/data/ordnance/german.json
index 258cee2..b5857c0 100644
--- a/vasl_templates/webapp/data/ordnance/german.json
+++ b/vasl_templates/webapp/data/ordnance/german.json
@@ -37,7 +37,7 @@
 { "name": "2.8cm sPzB 41",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "uses APCR TK Table\u2020" ],
+  "comments": [ "uses APCR TK Table\u2020" ],
   "note_number": "5\u2020",
   "notes": [ "A\u2020", "N", "P" ],
   "id": "ge/o:004",
@@ -55,7 +55,7 @@
 { "name": "4.2cm lePaK 41",
   "type": "AT",
   "capabilities": [ "NT", "QSU" ],
-  "capabilities_other": [ "uses APCR TK Table\u2020" ],
+  "comments": [ "uses APCR TK Table\u2020" ],
   "note_number": "7",
   "notes": [ "A\u2020", "N<sup>T</sup>" ],
   "id": "ge/o:006",
@@ -202,8 +202,9 @@
 },
 { "name": "17cm K 18",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "AP": 6 },
+  "comments": [ "No IF." ],
   "note_number": "24",
   "notes": [ "N" ],
   "id": "ge/o:023",
diff --git a/vasl_templates/webapp/data/ordnance/italian.json b/vasl_templates/webapp/data/ordnance/italian.json
index bb2c563..cbcc8d7 100644
--- a/vasl_templates/webapp/data/ordnance/italian.json
+++ b/vasl_templates/webapp/data/ordnance/italian.json
@@ -35,8 +35,9 @@
 },
 { "name": "Cannone da 47/32",
   "type": "AT",
-  "capabilities": [ "NT", "QSU", "no Gunshield" ],
+  "capabilities": [ "NT", "QSU" ],
   "capabilities2": { "Towed": [ [null,"A1+"], "\u2020" ] },
+  "comments": [ "No Gunshield." ],
   "note_number": "5\u2020",
   "notes": [ "A", "C", "N" ],
   "id": "it/o:004",
@@ -44,8 +45,9 @@
 },
 { "name": "Cannone da 65/17",
   "type": "INF",
-  "capabilities": [ "NT", "no Gunshield" ],
+  "capabilities": [ "NT" ],
   "capabilities2": { "H": [ [6,"S2+"], "\u2020<sup>1</sup>" ] },
+  "comments": [ "No Gunshield." ],
   "note_number": "6\u2020",
   "notes": [ "A", "C", "H\u2020<sup>1</sup>", "N" ],
   "id": "it/o:005",
@@ -53,7 +55,8 @@
 },
 { "name": "Cannone da 70/15",
   "type": "INF",
-  "capabilities": [ "NT", "QSU", "Acq. NA\u2020<sup>1</sup>", "no Gunshield", "h-d" ],
+  "capabilities": [ "NT", "QSU", "h-d" ],
+  "comments": [ "Acq. NA\u2020<sup>1</sup>", "No Gunshield." ],
   "note_number": "7\u2020",
   "notes": [ "A", "B\u2020<sup>1</sup>", "<s>R</s>" ],
   "id": "it/o:006",
@@ -122,8 +125,9 @@
 },
 { "name": "Cannone da 149/35",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF", "Acq. NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "s": 8 },
+  "comments": [ "No IF.", "Acq. NA\u2020<sup>1</sup>" ],
   "note_number": "15\u2020",
   "notes": [ "B\u2020<sup>1</sup>", "N", "<s>R</s>" ],
   "id": "it/o:014",
diff --git a/vasl_templates/webapp/data/ordnance/japanese.json b/vasl_templates/webapp/data/ordnance/japanese.json
index 6e83617..5e8484f 100644
--- a/vasl_templates/webapp/data/ordnance/japanese.json
+++ b/vasl_templates/webapp/data/ordnance/japanese.json
@@ -38,7 +38,8 @@
 },
 { "name": "Type 97 Medium Close-Attack Gun",
   "type": "MTR",
-  "capabilities": [ "NT", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "5\u2020",
   "notes": [ "A", "C\u2020<sup>1</sup>" ],
   "id": "ja/o:004",
@@ -46,7 +47,8 @@
 },
 { "name": "Type 97 Automatic Gun",
   "type": "ATR",
-  "capabilities_other": [ "5PP", "crew\u2020" ],
+  "capabilities_other": [ "5PP" ],
+  "comments": [ "crew\u2020" ],
   "note_number": "6\u2020",
   "notes": [ "A" ],
   "id": "ja/o:005",
@@ -69,7 +71,8 @@
 },
 { "name": "Year-11 Type Flat-Trajectory Infantry Gun",
   "type": "INF",
-  "capabilities_other": [ "5PP (3PP dm)", "crewed\u2020" ],
+  "capabilities_other": [ "5PP (3PP dm)" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "9\u2020",
   "notes": [ "A" ],
   "id": "ja/o:008",
@@ -146,7 +149,7 @@
   "type": "ART",
   "capabilities": [ "NT" ],
   "capabilities2": { "AP": 5, "WP": 5 },
-  "capabilities_other": [ "Towing risk\u2020" ],
+  "comments": [ "Towing risk\u2020" ],
   "note_number": "18\u2020",
   "id": "ja/o:017",
   "gpid": 3297
@@ -162,7 +165,8 @@
 },
 { "name": "Type 93 Twin-Mount High-Angle Machine Gun",
   "type": "AA",
-  "capabilities": [ "T", "2 TK DR\u2020", "Towing NA\u2020<sup>1</sup>" ],
+  "capabilities": [ "T", "2 TK DR\u2020" ],
+  "comments": [ "Towing NA\u2020<sup>1</sup>" ],
   "note_number": "20\u2020",
   "notes": [ "A", "C\u2020<sup>1</sup>", "E" ],
   "id": "ja/o:019",
diff --git a/vasl_templates/webapp/data/ordnance/russian.json b/vasl_templates/webapp/data/ordnance/russian.json
index da66f76..a021c0d 100644
--- a/vasl_templates/webapp/data/ordnance/russian.json
+++ b/vasl_templates/webapp/data/ordnance/russian.json
@@ -9,7 +9,8 @@
 },
 { "name": "37mm PM-39",
   "type": "MTR",
-  "capabilities_other": [ "1PP", "Air Bursts & Acq. NA" ],
+  "capabilities_other": [ "1PP" ],
+  "comments": [ "Air Bursts & Acq. NA" ],
   "note_number": "1.1",
   "notes": [ "A" ],
   "id": "ru/o:001",
@@ -42,7 +43,8 @@
 },
 { "name": "160mm PM obr. 43",
   "type": "MTR",
-  "capabilities": [ "NT", "no IF" ],
+  "capabilities": [ "NT" ],
+  "comments": [ "No IF." ],
   "note_number": "5",
   "id": "ru/o:005",
   "gpid": 512
@@ -189,7 +191,8 @@
 },
 { "name": "203mm B-4 obr. 1931",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "23.1",
   "id": "ru/o:024",
   "gpid": 6995
diff --git a/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json b/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json
index a315518..1725bc4 100644
--- a/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/british-commonwealth-forces-korea.json
@@ -33,7 +33,7 @@
   "type": "MTR",
   "capabilities": [ "NT" ],
   "capabilities2": { "s": 8, "WP": 7 },
-  "capabilities_other": [ "Towed\u2020" ],
+  "comments": [ "Towed\u2020" ],
   "note_number": "17\u2020",
   "notes": [ "N" ],
   "id": "bcfk/o:003",
diff --git a/vasl_templates/webapp/data/ordnance/un-forces/common.json b/vasl_templates/webapp/data/ordnance/un-forces/common.json
index 06c2e70..afbce56 100644
--- a/vasl_templates/webapp/data/ordnance/un-forces/common.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/common.json
@@ -40,7 +40,8 @@
 { "name": "M20(L) 75mm Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "WP": 7 },
-  "capabilities_other": [ "5PP", "H\u2020", "crewed\u2020" ],
+  "capabilities_other": [ "5PP", "H\u2020" ],
+  "comments": [ "crewed\u2020" ],
   "note_number": "25\u2020",
   "notes": [ "K", "M", "O", "P", "R" ],
   "id": "unc/o:004",
diff --git a/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json b/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
index 17a7719..69e33a1 100644
--- a/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
+++ b/vasl_templates/webapp/data/ordnance/un-forces/us-rok-ounc.json
@@ -38,7 +38,8 @@
 { "name": "M18(L) 57mm Recoilless Rifle",
   "type": "RCL",
   "capabilities2": { "H": 7, "WP": 6, "C": 7 },
-  "capabilities_other": [ "3PP", "non-crewed\u2020" ],
+  "capabilities_other": [ "3PP" ],
+  "comments": [ "non-crewed\u2020" ],
   "note_number": "5\u2020",
   "notes": [ "C", "K", "O" ],
   "id": "uro/o:004",
@@ -73,8 +74,9 @@
 },
 { "name": "M1A1 155mm Gun",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
   "capabilities2": { "AP": 4, "s": 7, "WP": 8 },
+  "comments": [ "No IF." ],
   "note_number": "9",
   "notes": [ "Y" ],
   "id": "uro/o:008",
@@ -82,7 +84,8 @@
 },
 { "name": "M1 8-in. Howitzer",
   "type": "ART",
-  "capabilities": [ "NT", "RFNM", "no IF" ],
+  "capabilities": [ "NT", "RFNM" ],
+  "comments": [ "No IF." ],
   "note_number": "10\u2020",
   "notes": [ "Y" ],
   "id": "uro/o:009",
diff --git a/vasl_templates/webapp/data/vasl-overrides.json b/vasl_templates/webapp/data/vasl-overrides.json
index eccb079..472841b 100644
--- a/vasl_templates/webapp/data/vasl-overrides.json
+++ b/vasl_templates/webapp/data/vasl-overrides.json
@@ -99,6 +99,37 @@
     "updated": {
         "back_images": "fiAA76LB.png"
     }
+},
+
+"adf:1824": {
+    "expected": {
+        "name": "37L AT PTP obr. 30",
+        "front_images": "ru/gun/ruAT37L",
+        "back_images": "ru/gun/ruAT37Lb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37LPTPobr30.png"
+    }
+},
+"adf:1822": {
+    "expected": {
+        "name": "37* INF PP obr. 15R",
+        "front_images": "ru/gun/ruINF37s",
+        "back_images": "ru/gun/ruINF37sb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru37PPobr15R.png"
+    }
+},
+"adf:1823": {
+    "expected": {
+        "name": "76* INF PP obr. 27",
+        "front_images": "ru/gun/ruINF76s",
+        "back_images": "ru/gun/ruINF76sb"
+    },
+    "updated": {
+        "front_images": "ru/gun/ru76PPobr27.png"
+    }
 }
 
 }
diff --git a/vasl_templates/webapp/data/vehicles/chinese~gmd.json b/vasl_templates/webapp/data/vehicles/chinese~gmd.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/vasl_templates/webapp/data/vehicles/chinese~gmd.json
@@ -0,0 +1 @@
+[]
diff --git a/vasl_templates/webapp/file_server/utils.py b/vasl_templates/webapp/file_server/utils.py
index 9b3a436..31b7f03 100644
--- a/vasl_templates/webapp/file_server/utils.py
+++ b/vasl_templates/webapp/file_server/utils.py
@@ -31,14 +31,18 @@ def get_vo_gpids( data_dir, extns ): #pylint: disable=too-many-locals,too-many-b
                             gpids.add( get_effective_gpid( str(gpid) ) )
 
     # process any extensions
-    if extns:
+    if extns: #pylint: disable=too-many-nested-blocks
         for extn in extns:
             extn_info = extn[1]
-            for vo_type in ["vehicles","ordnance"]:
-                if vo_type not in extn_info:
+            for nat in extn_info:
+                if not isinstance( extn_info[nat], dict ):
                     continue
-                for piece in extn_info[vo_type]:
-                    gpids.update( piece["gpid"] )
+                for vo_type in ("vehicles","ordnance"):
+                    for piece in extn_info[ nat ].get( vo_type, [] ):
+                        if isinstance( piece["gpid"], list ):
+                            gpids.update( piece["gpid"] )
+                        else:
+                            gpids.add( piece["gpid"] )
 
     return gpids
 
diff --git a/vasl_templates/webapp/file_server/vasl_mod.py b/vasl_templates/webapp/file_server/vasl_mod.py
index 6d0427a..2a6361f 100644
--- a/vasl_templates/webapp/file_server/vasl_mod.py
+++ b/vasl_templates/webapp/file_server/vasl_mod.py
@@ -65,7 +65,7 @@ def set_vasl_mod( vmod_fname, msg_store ):
         else:
             _vasl_mod = None
 
-def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-statements
+def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-statements,too-many-branches
     """Locate VASL extensions and their corresponding vehicle/ordnance info files."""
 
     if not extn_dir:
@@ -90,7 +90,7 @@ def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-stat
         _logger.debug( "- id=%s ; version=%s", extn_info["extensionId"], extn_info["version"] )
 
     # figure out what filename extensions we will recognize
-    valid_fname_extns = app.config.get( "VASL_EXTENSION_FILENAME_EXTNS", ".mdx .zip" )
+    valid_fname_extns = app.config.get( "VASL_EXTENSION_FILENAME_EXTNS", ".mdx .vmdx .zip" )
     valid_fname_extns = valid_fname_extns.replace( ";", " " ).replace( ",", " " ).split()
 
     # process each VASL extension
@@ -143,6 +143,12 @@ def _load_vasl_extns( extn_dir ): #pylint: disable=too-many-locals,too-many-stat
         _logger.info( "Accepting VASL extension: %s (%s/%s)", os.path.split(extn_fname)[1], extn_id, extn_version )
         extns.append( ( extn_fname, extn_info ) )
 
+        # add any child extensions
+        for extn_info2 in all_extn_info.values():
+            if extn_info2.get( "parentExtensionId" ) == extn_info["extensionId"] \
+               and extn_info2["version"] == extn_info["version"]:
+                extns.append( ( extn_fname, extn_info2 ) )
+
     return extns
 
 # ---------------------------------------------------------------------
@@ -297,6 +303,9 @@ class VaslMod:
                 del vasl_overrides[ gpid ]
 
             # save the loaded entry
+            for attr in ("front_images","back_images"):
+                if isinstance( piece[attr], list ) and not piece[attr]:
+                    piece[attr] = None
             self._pieces[ gpid ] = piece
             target_gpids.remove( gpid )
             _logger.debug( "- Loaded piece: %s", piece )
@@ -327,6 +336,8 @@ class VaslMod:
         def is_image_path( val ): #pylint: disable=missing-docstring
             if val == "white X 60.png": # nb: a lot of Finnish pieces have this
                 return False
+            if "-malf-" in val:
+                return False
             if val.endswith( (".gif",".png") ):
                 return True
             if val.startswith( ("ru/","ge/","am/","br/","it/","ja/","ch/","sh/","fr/","al/","ax/","hu/","fi/") ):
@@ -382,6 +393,13 @@ class VaslMod:
                 )
                 front_images.pop()
                 assert not back_images
+            elif front_images[-1].endswith( "-BFPb.png" ) and front_images[0] == front_images[-1][:-9]+"-BFP.png":
+                # nb: this is for Polish Guns (Poland In Flames)
+                _logger.debug( "Ignoring limbered images: gpid=%s, front=%s, back=%s",
+                    gpid, front_images, back_images
+                )
+                front_images.pop()
+                assert not back_images
 
         def delistify( val ): #pylint: disable=missing-docstring
             if val is None:
diff --git a/vasl_templates/webapp/snippets.py b/vasl_templates/webapp/snippets.py
index bde5a5b..8c89f41 100644
--- a/vasl_templates/webapp/snippets.py
+++ b/vasl_templates/webapp/snippets.py
@@ -138,33 +138,41 @@ def make_snippet_image():
 
 # ---------------------------------------------------------------------
 
-_flag_image_cache = {}
-_flag_image_cache_lock = threading.Lock()
-
 @app.route( "/flags/<nat>" )
 def get_flag( nat ):
     """Get a flag image."""
+    return _get_small_image(
+        "static/images/flags/", nat,
+        app.config.get( "DEFAULT_FLAG_HEIGHT", 11 )
+    )
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+_small_image_cache = {}
+_small_image_cache_lock = threading.Lock()
+
+def _get_small_image( base_dir, key, default_height ):
+    """Get a small image (cached)."""
 
-    # validate the nationality
-    if not re.search( "^[-a-z]+$", nat ):
+    # locate the image file
+    if not re.search( "^[-a-z~]+$", key ):
         abort( 404 )
+    fname = os.path.join( base_dir, key+".png" )
 
     # check how we should resize the image
     # NOTE: Resizing images in the HTML snippets looks dreadful (presumably
     # because VASSAL's HTML engine is so ancient), so we do it ourself :-/
-    default_height = app.config.get( "DEFAULT_FLAG_HEIGHT", 11 )
     height = int( request.args.get( "height", default_height ) )
     if height <= 0:
         abort( 400 )
 
-    with _flag_image_cache_lock:
+    with _small_image_cache_lock:
 
         # check if we have the image in the cache
-        cache_key = ( nat, height )
-        if cache_key not in _flag_image_cache:
+        cache_key = ( key, height )
+        if cache_key not in _small_image_cache:
 
             # nope - load it
-            fname = "static/images/flags/{}.png".format( nat )
             with app.open_resource( fname, "rb" ) as fp:
                 img = Image.open( fp )
                 # resize the image
@@ -177,8 +185,8 @@ def get_flag( nat ):
                 buf = io.BytesIO()
                 img.save( buf, format="PNG" )
                 buf.seek( 0 )
-                _flag_image_cache[ cache_key ] = buf.read()
+                _small_image_cache[ cache_key ] = buf.read()
 
         # return the flag image
-        img_data =_flag_image_cache[ cache_key ]
+        img_data =_small_image_cache[ cache_key ]
         return send_file( io.BytesIO(img_data), mimetype="image/png" )
diff --git a/vasl_templates/webapp/static/css/edit-vo-dialog.css b/vasl_templates/webapp/static/css/edit-vo-dialog.css
index 1300d86..73a9938 100644
--- a/vasl_templates/webapp/static/css/edit-vo-dialog.css
+++ b/vasl_templates/webapp/static/css/edit-vo-dialog.css
@@ -1,23 +1,24 @@
-.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; }
+.ui-dialog.edit-vo .ui-dialog-content { overflow: hidden ; display: flex ; flex-direction: column ; }
 .ui-dialog.edit-vo .ui-dialog-buttonpane { border: none ; margin-top: 0 !important ; padding-top: 0 !important ; }
 
-.ui-dialog.edit-vo .capabilities { flex-grow: 1 ; display: flex ; flex-direction: column ; }
+.ui-dialog.edit-vo .header { display: flex ; align-items: center ; margin-bottom: 0.5em ; }
+.ui-dialog.edit-vo .header img.vasl-image { height: 3.5em ; margin-right: 0.5em ; }
+.ui-dialog.edit-vo .header img.vasl-image.small-piece { height: 2.7em ; margin-left: 0.4em ; margin-right: 0.9em ; }
+.ui-dialog.edit-vo .header .content { display: flex ; flex-direction: column ; justify-content: center ; }
+.ui-dialog.edit-vo .header .content .vo-name { font-size: 125% ; }
+.ui-dialog.edit-vo .header .content input.select-vo-image { width: 15px ; position: relative ; top: 10px ; }
 
-.ui-dialog.edit-vo .capabilities .header { display: flex ; align-items: center ; margin-bottom: 0.5em ; }
-.ui-dialog.edit-vo .capabilities .header img.vasl-image { height: 3.5em ; margin-right: 0.5em ; }
-.ui-dialog.edit-vo .capabilities .header img.vasl-image.small-piece { height: 2.7em ; margin-left: 0.4em ; margin-right: 0.9em ; }
-.ui-dialog.edit-vo .capabilities .header .content { display: flex ; flex-direction: column ; justify-content: center ; }
-.ui-dialog.edit-vo .capabilities .header .content .vo-name { font-size: 125% ; }
-.ui-dialog.edit-vo .capabilities .header .content input.select-vo-image { width: 15px ; position: relative ; top: 10px ; }
+.ui-dialog.edit-vo .capabilities { flex-grow: 1 ; }
+.ui-dialog.edit-vo .comments { flex-grow: 1 ; }
 
-.ui-dialog.edit-vo .capabilities div.fieldset { flex-grow: 1 ; display: flex ; flex-direction: column ; align-items: stretch ; }
-.ui-dialog.edit-vo .capabilities div.fieldset { margin: 0 ; padding: 5px 8px 8px 8px ; border: 1px solid #aaa ; }
-.ui-dialog.edit-vo .capabilities div.fieldset-legend { color: #666 ; }
-.ui-dialog.edit-vo .capabilities div.fieldset ul { flex-grow: 1 ; margin: 0 0 5px 0 ; list-style-type: none ; overflow-y: auto ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li { height: 1.5em ; margin: 2px ; padding: 2px 0px 2px 5px ; background: #eee ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li div { display: flex ; align-items: center ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li img.dragger { height: 1em ; margin-right: 5px ; }
-.ui-dialog.edit-vo .capabilities div.fieldset li input[type='text'] { flex-grow: 1 ; margin-right: 1em ; }
+.ui-dialog.edit-vo .fieldset { height: calc(100% - 40px) ; display: flex ; flex-direction: column ; align-items: stretch ; }
+.ui-dialog.edit-vo .fieldset { margin: 0 ; padding: 5px 8px 8px 8px ; border: 1px solid #aaa ; }
+.ui-dialog.edit-vo .fieldset-legend { color: #666 ; }
+.ui-dialog.edit-vo .fieldset ul { flex-grow: 1 ; margin: 0 0 5px 0 ; list-style-type: none ; overflow-y: auto ; }
+.ui-dialog.edit-vo .fieldset li { margin: 2px ; padding: 2px 0px 2px 5px ; background: #eee ; }
+.ui-dialog.edit-vo .fieldset li div { display: flex ; align-items: center ; }
+.ui-dialog.edit-vo .fieldset li img.dragger { height: 1em ; margin-right: 5px ; }
+.ui-dialog.edit-vo .fieldset li input[type='text'] { flex-grow: 1 ; margin-right: 1em ; }
 
-.ui-dialog.edit-vo .capabilities div.fieldset .footer { display: flex ; align-items: center ; }
-.ui-dialog.edit-vo .capabilities div.fieldset .footer img.trash { margin: 3px 5px ; height: 24px ; }
+.ui-dialog.edit-vo .fieldset .footer { display: flex ; align-items: center ; }
+.ui-dialog.edit-vo .fieldset .footer img.trash { margin: 3px 5px ; height: 24px ; }
diff --git a/vasl_templates/webapp/static/images/flags/anzac.png b/vasl_templates/webapp/static/images/flags/anzac.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1d1e30d37a1a7a5b63fc0e365d44fe0939178aa
GIT binary patch
literal 28355
zcmXt9WmFtZlpWmN-8DGDLLkWC65Im82Y0vNFt`T~ZUaGryZays?#|$Z;J$pjXMa>z
zpIfi{beBA<TTyDNa#-l(=l}o!OF<r}@mBl%S5T4Pu2c{43U3vfv%J0=0DwL4Ux7<|
zhfVPYqPQ!l$e`@NVI$#^uCLGS{4XS<=Pv2tZtdg>sHld@zd@MpZxGPZ&D_<-+1<v;
z5kP=O$MA-u|A$LEIs3TUSXsLRs&Jqm-caoSMO`gT{}ZKkw{frp2;AbJy|tkI*P`hJ
za`!TIwFDSBzy2qV@xL#(aWl6!eG_#BH1{+lyuqmd!Mdidjy8@~fF6qd$Ttk-|DN}7
zHMay@zlI+FznHX>gM+1`JKzTTz55MA{!dKH#@*f$P=5A@1puH0C;%n3ymLA_>}r`7
zJg9GeHr^DqPwlLe0YZh~;Nca5;o&fFjSGQl#a{^(^naPNL|YHKa{OW^DtVIASb8bQ
zbJ>&Aa-mOuSHkL9_zNl1Rhw16kW?Lqr&u0LD<4u!n+yOCo2<K?i`AU1`_-h;tidL8
zdohif=d>x-%3!OZZVxLPzW#QnDxiq&iXD?zdLx&ZYF8CwD;@xSVZR+9)eQt&y~zTD
zGcuu=^im*XZ6?3~l!rfqEFu9;%i~cj7Tf~`_4kW>aPKGsq=Mc3UJsU_vEcX@swUXQ
z1^{rGYaYmellM|8(FJePHg=yC^wmYYL$JPo0XRS}1!zhAg_NR|1`JbV>-p=a0OSdY
zclot=Ba-1z7mk<2S0C3*#L&`$=-T>kUAT$XsrM7&3YXa5ew5c-<VPpOT?Rm)m~#!H
z+oM5s%P^^gc*hj93St3*B48b&x`~v8kuvP%jQS;LphIH;L13N`c=~0&3HSWl@41md
z@tcm3U-x{+{}s{F{PKS~mD7KrLRt<e6DMt9_p3p?HBer|7I7u!H>XcN4FG+=5P;<{
zl?(uchen_u4Nih5zFcD2kBS<CQ33g>W<{fd^uK-^(pa9-WdOCHRk-TZ=MGay5`z3<
zAJ~Q@TUHxr#Oxodx(G}Hhco=KZoY92bz#oFi&*&~hdi#{lj~LpF$39ysvuPmd(Z&1
z3bdPBq=Aly2gQUcvoQex{1p5M4E<2$DETOPx!Qz~%qZ3b+HU)dCH3h9zE$T|?rzA&
zizmXf1Ij)5NhkiM9b7w-t6zXS<vM>o=X4}2H93q_KSM@aA1EBw1047w>lENINe1;N
z4T_7*BvWM5QLN)zeBd1Mu>g_P@bk0KE0PAO=*AZ1)8tY{_u^9u?5%*$6??iJOai}1
zek1D<gjeE5@WMDD%3l`V1b7DxUH)B$QsVj1yRP&?v1#GtJ8pk9H?vHAdi|L9$xBt|
zSb&=tLzPV(H8_2oNCZ~y@WmSjmf7q?A=u2RU$T!NU{PJ15ZWjnj;9eiUjxMIvl;v&
zHsM!-WI^pQYy%IK(If%~5rxscTV;E0sLZdMv3B20@RQ+1^h8Le2fveLE+M3&ms4Jc
z=73vLeLokk`@yv5C|FYsKgM_i)}wBLCz%6vU?-tm(fdCNx2w9wiS<@oEt)K!M_cQy
z_Ml7k9nH<$kB^V5O`QDvA{YM7&Jrnyse;D>z_6TK`3eO7{umQ0ui^O9v&A@}-06FN
zkWfyGYEAc6o9n{6b0~{rN7t(NHjsHstD#t<VXCz_Rl_Ob2dbDvC-^vMs}Zb}J;5A~
zo07?dH(HV!#!%{ijPL9KdbN5RF*qNWTCdg(0bDjb6U0RT7Zvj7>U?{$qq$jvdJ??u
zB@TobWIVKz@>_94%`gZAq31_tzY=%uMcy+s<%K`*KGyGM3HH?c5^T4S%Om5pb%J!*
zrV6?g@go_4Hi5EHp#ga|+57|qX#CN{1Dn%cR1%=<i7~M9<EjBzRYvWIecycH)Pi}u
zxpTYe>Tkc3%EsenD4Whqb@>ew%n`8if!`gvil=^_b4(H=W2~)`=XPcuYlG-Be#Tje
zqjJ~y)R-ACZt`js?2l-;S-v5_Ft2pd2)Fz5)3rkVE!~}lhP((0e+)hTQ5$;p9G|LH
zy;`&^J^Ffh?N_J1orF(#FLw#Aj31w`>R*<ux{fr*zIokdR8~eEKd$d}wb+QIX#4`B
z64aq$cm+%$GM^(<ka;-Bts|k+<)=!i$$;S;R><?eYuM3!;McU&;bclvY3HiHXFNYO
z8VM?eRR2+FUjMV<HYK)}z45gFQV>afBt_Jo?3!Nh30U59U8=Alkv?I*)NlUEB?^Cy
zd}Z<h-TedlmG|>6O23$yX85aS%zrQI;r&{Oy2v^pAbP=1A7n~vlj>e69jt6mssV+Z
zseN7;WqPG0W)~!<1yvf6Rs4Pzw&V0P<P=f%!<YT+gc8GQG6##rvE}zUwdh%6xp9pF
zN{=>On`dWIspEhMOXXa&G%CJSaVlT4gIvmJs%|9_5{*1jIV4(<t+wj#dXd8ybGmU6
zeQh6xkcu>o1$CM79PvvH@o!Jw*u7;lWyXpDXOE*Dhi;>}w_SeYU%uu0Ewr!Ct-B0U
z<z_aP>=M^{wi-4;mPKI8xKg@WqT$!V+r!Nji==hNhcyWy_JG=Yzo%^Y(=YHo=iB$v
zcw3eL99sS*OT1qwxP+**K)fg!f$tjZ+CLT9Jos}54l0jIQpze5K0RC<;k?Yy45YAp
zmcgS*p!r0tQ>oH&cIRQ*Xz+O5cF7|Qx`5I{j&jNqE5P909R0TiSeuDwKawnzjkSMC
zWxL`CO`>{F(Sb1{k}WK&*y(ewqAdVh$22INQBbJh_RzKzP~u2k)cl}#=3%sOqoV0m
zrkZ>9(B-i4cW9yc+-J&fd7)!}?$mwRKF8}6)aj@+N@3P;;$H^h1h?TGI3#}ODFwBB
zy#8Quty2uwB_bO*L+b=L#H7A8HY;z!Y!L}SL4XgkmO!M#cR`Zkq!$QU_A}=GUU^iM
z@U7z^@3qXh(#^Q=wxI3hfuhh&oKHcIgShwc0M45kHnFKO7LPiK!u<@QQ#R2~YpZS{
z+|xit;)sZD>tbP!aEo{4I(P)Gi>4N%7D%xT0ukA+nYWb%DEQyu9fRt*L`5(E+_Ld&
zo;`4t{3$*3|FfVn$4!hvh37S?>2)+)@jX-U+<O?O@zcX3&B|)Plu<V8ADt9X{Z~%G
zfILCQYNUb^xC6(JG?v$C5>Arh<f#Gu5`mhu=jTR?U4i4f@51APJ3)?!A|@uzhz0O!
zWNO*!xo(a}r4@PK_7C@CjPJ~z@23I_US`ens?#4UkK$L(%QK7`m+Z|JJm`i#G&me*
zGG_Fmi8}G5YY_9N-~t~!IeSG*)n{}B3MJR_HBxhg*-L_CMhH#J_%u@s%gw`6>qTIR
z59>KNrI7jC&LP~?!3ttdk#v0Xk!?fAc5MxIwt;B^bsTFHYh6Xhn0>*$Z_--JLY;>y
z$IV^WC_)?0Vl`{R!*&@C(WVG}$UPBY>|Scgvx|Qp{U}n6$N~bTB?9~Z`#)0q!SY+P
zL?WA~*zq(r{+bd*faHL-t<H5t%`r%$ER`H4mE!97a#Yc6`|Y^-#pv>GC(lts^*U~0
zLodcfCVy;}9S;pcoO3CuErz*{IT=go47{e7R}ib`A&6~YB_QAx(co7M_*`czuSCYK
z4n*bZ(W*FJC^rit<_AS&kq1v;5=+%4$3RRgzY%d7<lMGq?5ApKaN6)?UKw>CDvjp4
zt%`6{NUVrAo*vGW%?qu2n_V{1_<BE2dOZ*96M1!*t(A3fG1bUen1d*^*Ld7wlIF}`
z0tipwB{J`AZRQt{9w^{_FnGAqS)0Ry=t8K2ZU7(gLNbT0eW|iR2I(5M+74Nx4ZPBB
zE>3~}R=S@@c4zXw6}HxTx!{}43BznPD&LVn=4^>n1fu2N3*aOQWkmM1Zst}fC@KKJ
z;99tx#~-=3&;cMYRjITfd8Ak-DmT<Tvg<Pt5tkQLwxj{vizNWm=84+Vpxth2ly?y7
zJUux%ux(_guf{DWEhm)0UT4BhmVDIEn6k(fcGOhO#X$fc&za45W?y&SuD8Ez(LDaX
z&R%~ieOtAa)yMO|2Ij&>h@<`*`~lRSBEuoTgY0d}Cc*^;h$Zgn243rSbB!3axBhCW
z{RvN%WzA1fXjPwYz}~}7<3H1MS`0Z>Ky~@G)G!k|*!#5b?KCj+d2c6SYT&;0)&;rW
zUNBolGp|%zTV>f%%ydfuTrin+WT?m){0^_e|F3#jXcCgyzwLn-5+^lS$YshQFq)`_
zht8D5j8L11B<D&*^n#ui|6-d^W*{Z3r%*?)psx>}&oh_|6AzD0(DTQjJd=*3{N_Lu
zD=n|=p(5-E;yM_eXpRz6$r8t(ajcmPL3cg5bMZR5Vtd&(4p3ii+WX?z8t#=q_2#}M
z%qJ<b6-Bmckx@)V-d1}yoJK$(UCiH%(?@k{?`;3=3cg|iLNaCMH1G<lv)XJ{nkvl1
z*ksDMJG@>0ZM<%CtD2XWz3JSb7Q7?{?Kuy{R@DIABpa=Fzh^rjNFZTT7o#KKNEC)@
zM#kf;%VcJFc!!t0VyYrDH}zmDrKkpfYT<x10YGOQD~TtJj1Dn_P2(#Aa&QG4>3X^b
zAHM`JR))jdDZ8nWUDgthzcJZYTS9T8k!hAUJ*OVEtm_zG^en73Px<KP>HhN6W8t((
zBpnOxxXDR3VB@D_>)!XdsVC@E)z{aDg&GaT@zg))J<HH}p!>*C(r>W{{|7#rxN)~b
zyHXuvf?Yd6$Io+Wm83pY*Z1}0wFc^08Vwc4zP?AZnTJj<G~FW4+s0x7r<$3Df!n1O
z5S97L>o7fX?MlTuU%}jg2@p{xF2GycgJU-=x54P0GL&&Z3fgKhCc;mUav6^*Yb(n{
z1il>r@*qUB&+*cy!Sj`-5<v8V^-Unw?L-|`J(vTScy(RJ1-5GM_B-W9m+Uztb+k(Y
z7AR86y^WWzWsem!H8!kZMrX@hNavbdtu>IvbDEQ8p&!D(&(6;qA#KbDzT$a5ReyYJ
zb)DqgczwC8q5gKaWyxl#uc!~F2d9Uimq6<jaBZnb#`U?bNd;XO=^<<X0iE-KbtF=f
z7|$mb?|l$zKC_fcSQL&aU$%<X=TFbj6XU0ZS2NFjXl5(fR0q!Go~@V?+eB%~QUhVO
zyV1s~b3fLEap2+jwLeU+(WZUmL>la2-M-%JaBc{Wj|xziR~JqMV@Y9zf>*kB)R4^Z
znCX|@IV;#6am!CXj2W<o$;--aQ?hWTYJ470W{lSu(?XXxL1koI*HmYqVK5R7430PQ
z${~qi8q~W0)tk~#?)`Domit<xYdA-A8!#;HJ<5aw%V|xe&u-c~bZ4iJpHtR2x*Lch
zsDeBd-~@mb*}Nz0zDj!-(dY~g-4r`8^fy&(St7+sH^rBBv_~Iyv5y!dY>xZ?od+V6
zBO@2_)<<QkU<!)*{3}^PdFel&oHT9`-dNel>$UzmTe==@qv(TPgci$8!hJUPRmw=)
zL;IJkHX<y57QY5rjxl~o#B?h)Mvs>nkJ+3rC{99oKvw!(SI2VEG$~1gi*Zu@x0DRV
zUMd`BS2bZM8=V!B{79<=h*p4t83{ZaYgQh$gePHv$VZyV7Aj$@I2b#T8kPAtt27oB
z0EXv@xm+!Siddo1Isc9SocCc6`7hSOhQw#_d&XQ*ulTc;9aSi(zK&+Xq;%y64?_r?
zyLOOVqQd~%2JXnIWiT<X1g7Y00SbXbsILq#32aLb(NrXWS!^3-{P^VNa#Qot94Pi!
zpYZWR-fX=O6?6UU3Wt2ohku$=bvC+247*1kw9;<Kf6|s4fVsR`Ch4+KqYzyR13>I1
z>a{^jY;~mSK}BP6xwJzTgW%X66I8S+QY4a*BwT_NOC~zzb9fn=iZ2deEW&{#24;<-
zWWJ=3MbfIUG2P+{wLQB;{3PBq!^IdDO@`qgkAf-bJz3~-#=LC&WNx<nQ`sV4kQWL-
z$Sy|&+FkqiPoy?{eCEDe;VD;rZrqz^?dL;v<_mOtVYnT8IUMQhQk1S<^uIXA6L{9*
z5iMsMv&VzJWqzi9{%gvm>}*bLAIqTL0FnJJxyf4c9wZ3Ilc~xw1M7a+KG}E~a+;ui
z+})`^bpH_gd)7pgKGU`iIRbe=AeaGMl!;8?W`ggDOn_&`SNmN`S+?XLF;!Y2Lz0%A
zDKrWX5@hK(Itb7V?Va`z10diPLFg6PoF|Kp4TNE)AY8I!x(PI8cs$uLvWjE6NohS3
zKnB^Q$ni4vqz{;2oK;Q3oW4AsDhGX>jV;9*wGLPPw;^9oXDuWDDQ2tYn6#sE$Bj4#
zmfn8OcOzSp+s?B_l=J7-TQ0|riwGq7bYL4aOBd0g-<o0Dfd5##k!CzSJd;~<$XSMV
zzZ(AU79s!)?OAaxSTdFT1eRx%Dk&8RiU2e74jqDKCSN9;Uh?Wc-H#O2?}#o;WkE8j
zC@Ga?R#O+VsvWXP%~e1|NwS)VoP(7RettYRv(l>Y#aUD}Wd3}`Ni_TShR8@zd4Zy1
z%w5vsIdp9!^H#llLYXl%Xl(k|4`|F%lVo(*L6?6sP59rdgqbIZGbytWKw)lxu)SV<
zaoJhz@IhAvUSNX}N*TPcR33g>YLyK+s^}<Fg#;=(djNA^ViAI(iMari^uC#;cd1md
z1+6JPK13>RO8lbunc}(G`}Hvpu6-CL=pAWhFbf89XF4sjn|!$pu&!>ty}9L@o;-6A
zwfLt^ZxbR3Sm(R5CN!$BO>=VudMCSn%AJB~o<E<!UV5h{rgA=ru4Gc?N%FdJK}|A>
zQ&~jHN~>8s6f4Y<<$-V}HIV95dI&SL4+>our6)JAp1>4ga*f~WEb2N=a+R8S@4Q`W
z$i0~b?i>`?A{yVrPZ>oN6?HT8TJvbRp8w+VbmsyH+Zj$^fML?pmV{l~Ms>!(F8;)n
zIlozF!wzS>62d!N=gYWelR86*MK~Z2)x(7pDy!|m<9Y+3mbRsGNOJveQhq!=v?>EF
zI19W{+pG-EI<>M=>0RZ92-CDi4y?8-UP_MdBqTKfr(QHqDS`h!QRcMl4VVSKZc8<C
zbmF`NeI@vfED<v<s`gKN(Y}4Sy8d0eKn=OI!(%y*P706gpE?M+cJAz?%8@PK^R@Bo
z_0n4?|6|Q{=V$%56i~{N#eCCR!}$zi?6RD3O3~Oa8FNH4Z+c-t&s}f<bC_fj<uB8a
z%w#-?Dj<;7^lmH^qd<vs(nxP}HQY^D?|et#c0C4##vh^U^>HIs^sEIzRFq#BR$z-t
z*CP^%>m&a&n!aQ!lZWC#+%)hUfZ~U8H>TSaf)jZ6I#@>iO86j7S3=#q>MH8#wXgSc
zo)$R=qg<L1FEWSVy%j1iRHA2EN3o^Yf(Hzs)7uJOlSQOQ2<~x);?nKr{H!Rw*|qvq
z6Zkhzy!iEi<fVXmMWj?e#!=92aC);lO~3iuQgxp#Kw2^idZI{7v)>28C3SeL9AYIW
zGKnK&F4?UR7P89%-Auh4e##EKh%wF(m~j6(=)2A(G}BgH>ae2HsF&haAydp=0>s0X
zuK6xZpX|azRwq%ODiw-u!GmDv9F|0nGLCRn5osU^#={Z2qg}r~%j>Z_Zzu5}C_o0|
zK8W`cF51uk6_*kSm6y%qSVX4*A;rwWE5FT}8VVVFX)biW&68FP?~|0gfxJ%-tZ&-N
zJVTi|2yc<}5)@zh!=!$R7G|$XsSL+Cs5d}r&yb?6H%lm!RIjdpe8uCAY#U{bRoGZj
zEunWpoyUEH%|+>dHabQ9bQ$>a8E5^a-$`^)MDWu{7D-8JN#;-4UW-tr@VN2i==fim
z@!zqHCryMG6EU*&DJ7baH{UF!^xyiN@slJu>de4hhCsegfiF+~;v1QGJY{Axp`oE@
z{6eClqACm5+OfR*1q1`xnUPpxGYlgGK&>`9PWMT;_lUaaGRAz$L`G-M3u|6m!yETI
zcfmCN7@nS<F13LGmmvLMh^ZlGa4!KHfLao?n?tuPfmn-qYpxj#sG5Ig%{u@IsRba1
z=`lnE8S-^KK;7;-H(mq$x4FfGJL~;$-OA0vap6a-+h>PN04b!Q%1XRJDnKpmm?Yvv
zOMrs*quBw#9<?J%+i)*gH~$yyF9ash7U!*#-oWSeyrtK}?psZi$x+F%XL?u%V<8d0
zQ<K4M($U<w?eBl%-A_vCjZpmGo|b*{IDVw?crvj`4dCpIL#=@c@w?uQ?B~hzr^zZv
z78(B(Ha2m6TXk8<0b>{sUXlTp$EZjMuHbQ;*SgQNn&cQ$lw<{j{yN|@6N#(p^sGP~
z!&Qa!ipNOS-|6FSod5Lvw$;XCeG6>v76AA~+_ITpLZf$tRAS+ME@6Rd%0rOj<-AUZ
zi~~dJLkyMr$N>9xa2<^|DUzBDN2*84c00mUboyb{dj{*S>)a33Dd4z2V;1Y7dRU3Y
zSZd=o<Gp|@TTw7G55bb@UpXFDtl;7#?0fE|3}_6h9_5~fnqshUWRsn`mJ0Cd()g}}
zO0=nR;~H}QOC!28H8pci#EOl{ZPI9oz*AqGv-_=MfYLpJvk^A-dd&sROW8I6b&LHm
zsI7LcFszK8FW{^dW|i>qpJ;v4>AuL`Qr+54ef4Q+3W)D;*%4pLdbWzMe$0nvc6ONE
zcX|_MPPF9r88|ReT#$<IgD1>_2><<<DV1>JdD-ux^gNK@+e`Pe&#DXT^sNK-s2vvQ
zVTg%+%3G_nXEA>hDR@lFg}43+t=y1J=L0Zph=aW;^x!_etTA0Hn1T-4up!Z-79l8S
zfdHJ<SHMwQ-ywflt-((doy{Bslid#K-%{_D`RGB#s|0><$h=6jxb@St(xhn`5}4+u
z5+fO-kPlhCS0_vS4`c0Tvji-TtZYn7^bT3FLfLV?=QZ>5eh2A$y5H{8<E!xr>6dS$
z+tr(5`wWRVJw`3JbFwo`+rHLVy}oRG;(PpK9Oy$WE#Nje(SgIypA}C~z+0HLG)QXB
z0TEB%&Q@SJ$=TJ=%TeRctc94i8ce%?2+ve!Ckr?$Q0uskq#l}jItdJ?@xMdKH%L^H
z8bh;1;y?&$WkfY@S9Ckw0n18oxA)+3{YJgYm#Sb_CSoEvIe}hmN^it`aq1?joI@|0
z`XRN^4Cc+ZF5qg+n1H3a;+Pe7U75h)As{p0_M*NA(tH?E?L*iHGD`tcLZFjBM2p7f
z3ReSPj~i^rPanIy&(ksmN{Z=SIhnJc#;mL5oST(BNf8q^I}?z#KyQvoAtZ&gaw+ol
zAi;{}Y4dynqBpVJl(+Wn@f|2;(6&vFgM!~q3fxG>PK+%cX2RoyTyf-UIKQo+;#0qr
zA1lIx_q**_O+X;tIFK^%_WYIP?!xPZG;0*ms2Q%kx9odz??*o3AlqP`Knz+MxCaQW
z(*hEv6GKriF(DGaY3Els)<v<dn1$z`3v>fPWnEW<5&%&tqlMj%MXAc$s3|tmj6q4s
zar4qSxT0iLlP19&c1s52oLUicX;Qvtt7L0SYroIiU_Z<tZA<p=hrAn{9xX#qhvv|A
zXG(E`xuhfIEcVeO+NzI1b$S9ck9Wi5n%O+#1AbW@?*Fa;RT`&;u@J&cBY8HTx%JG7
z)WWxP!AWOX4!_@dl3OVR!jnC5a8L3z=rY7tX9xCrF|{L5<0CLj_@Pv^Ut@;OmzugW
zWOQ@y3mgeUP`X41rNxJnZd!Vt(L}gR$;SNDu%$D^@j-Yx*%K{M?}g7Vh^3ckFFPnN
z4A|J%xFFG>pte;50&@26KlMy63UMtdSdy@@gqT%hGX?gl23YAwWRo*lW$rq>E)0E7
z>W2SNY+RLgK_I(1N+qeOZmN^5@4iHMBjz;iXUQ=;kt87jf-{Sbm}Dv)+S%|_Xnb}N
z>g8wx+^PLDD*kYU3AcK0Z4ZbD!Ii7BX_uq|q*-OC>hEwvgwK~m=wKh;c3EaURNl-2
zPf%NRzgg=5PS>+($9cecKUGZ!!SMvL(Sn(H9)sO-Q&CX(Fs9qe=u~?BSvFi&Q$p4-
zztN5FV=EAo8U;>mT+d0zc^%H;KqKaDdq%hWfqL~O`iqNmZ34Id#bwJyDM7|5logmD
z?)5%X$OHza49-AP2F$SLp%1k4>Zk>op5#O)RuKO@*8Aai*2<TwdVSV@#{TwUB@SPx
z+GVS?tzNQ}Z-9hgj#Lf$&C0fl<Ef7qnfq_X&L*q`&n51*i@EUOfx@v|=-4BcH=?OA
zAJpX_%F;I}GK^dc(IB#0Z?Jo>B5h799kT}y?GgRYv<<(mJtn$-a$iSfcpxXa<qiU9
z(ZRppt&z^+!&f7U9IuSue7dH{zCum)AEdzplR?n65unJY38+Q%!At(}D($k0X!Id-
zzHp$S=fGnR6K4B1Eb-gcsjUGlp+akB`X-fTIs|>Tq0(t}_4j7-^X?hCUIDs<S;uW-
zowlHN6%|rWw$C&#Tagcs=YjceF}@hV?ZB)lEvU~VI0g<$&>~t+QoM>JA*oT5lR84r
zwIU>D&VujfkGm_Y<Lc9+6{qf^uQh_#zl>(-2HG4}SXIq7ym}uuJKer%CMSkGcEP&N
z**vILs!TfdXH<l8dzLP(Y@A-{!9hY@_gHr;pPo~Kh#QUtGDzcX61k5--Vdc}6x4rB
zVj=`QY>_{wqq|7ILgJ2rk;Wi*k%KP<3rnWlGnUUPh!g>T|2i^Jn7f4}7gXEjhz4R0
zC(s}en7?j|AC*Qx=*wbJXnb*N{P&FR292L&a>U)xFYhVaMTZYg4lhAty93$Zr6zqq
zEUbh1wz89yylmI3h=jG4tQwO{oVt}SXDjE2Km1<q&!UEZ95}XL%vb-=S~F`s@c%m+
zgs8?Wg{+5MtMY$}9HRQg;~jiCYWe82H;jdM;INF^&;KF#^>2IqlDl}l89%&AhId~W
za;Zmb7kdc?<8JRRII^TfgbBps=gNbCL?Z$CDfq4ym)iIFc01tw6^T+*T&{VYQrsd#
zvMH+$J3n~n+D&?yH#!vF$<^Aqd1j83R0(dn5|beW7kdfn-l{<Hor$J;pZt?m1`#Bh
z9jM1^t&T_|M=&MN7OFq}9?P-o9`x~gR&#M>C6tVo9Gu+WkfnKsPD!Z-U`JL$D(0~W
zCC$|2Bg|l}d{-D;`KLzna7C-@X*PZAxyH|^>%QrW(uN08n7u67rWA+b$!xW0HMcPE
zYU}^G0AH^2L8etC!=2BeN5(HT-CvDbT69mL3EJC++8nySBduAJsP4s?Xe!52gmp2^
zeDn~-9hiZ%-l#uy-nDGLWz<qrFCK&fX}-PCJX0Q(lDmF2q~7@IX<y-ehb;b7=Fdn&
zt*2yy&=Kb()Nb+X<j+!uY!d;YV2)g1jc4jLGOIJ`&eGr4?qx45x_pN(8D#5sLqdhe
zAD(WUUIiy}#c)1T(`gmUOhi;6zinG(mF|-k!7+kLk=>-r*x@npLhbcAiO0F-wXdHp
zr?hCE0>$+<ZaZ(ACtLN@;GyvOon$N_j?W~<t=q4^M#v=q>dxW=+~U^@yy+S$rS<HU
zIsudFD(1X#CKmzhUpw3a#>{$Jv}9T!?DOjOqf87#661UDF@xfct*68tk7DOTSVF5o
z8t6@xFWs5ukBMp4ln6Z*i0UD_QX>*+!5_%7)_D%GW*l2QeU#&3^Jxij(ee0<9+ZnN
zE&;+whGfjROLN_tifE8XyQ;s>PCgjxmp^Xvqw%sQ$n^;XpCi!GA*J-L%IHPKnQ<zy
zvqa^Z8f9uVI#TKFEl2a(o%|JiiXID<XVv02qY1jk5C76D^>mZK^r+wDwdXP`5VQbd
zi1)11k>iRJo4xowlzDe2R+S*WxB#{!u(?<!5I0h5wlYbm=TS{WAf?c9wMqsIW-S4V
zSY3%EB~TC7bYs)`c08_q3T{91Wm;~Mp*-$bA)d91lP0Djvqv;Wy@=j&x3+{s{*;R*
zkLeC?pJTRz)rpJFOSrO6LVohg$aUYs-8z~Z$F%wzCKejJHWjne#?DrAC)T;|RJ*zW
zQ7jQY>5%LapP}<^2m=pm+CYFpj?#CtLAL0rk>HOg@%VxP6hsECq>#%;lAYJ*FWp3R
zl)Z$Q<bdlQ0FPwmNEdbrTCXTgp3hC?)*#8}2$-=yZ-m;Qnsyx_)^>pNx*zU6=mQDp
zyDy(5-qg%tY*@H5k;+Uygnk01c~vnu_!gTpe0pH;KJIr4C+PLG;t+ED^Y1#tZ?A>&
zmX}l%-`<kcSEr$Hu_dJOot{YlGMga0J8%TZDjT^Gjv<NOOBO8GgYumpeP)ZYWtq3C
zLUAQP;my0`$yL4hyRsf}-g^Gka8VTFjRZm^_>7ERVjm8U!jeTdm&W5+74C?-52MuL
zaCN_EP2nDR^U}n`@584CS@NFz5$R(4DX^PYNCl_KV*c5K_~KnYV|(MlV!r=9D5AkC
z`<xd~FRofvZ<1eYSRG1yiFiX#4^U#;G>v4Evl!@8UiXXEE?xwNvBN8aJq9*jxnI{!
z^{47g&bN_f=XUKvFzWjycTD(MF=MQSjmfxlqM!9@QKQp@ssbdFL;8?pExp5vL)Wpw
zH6-`pW#E+Q1~+4RiF$}6#sL3_H&sb<5&pHbLg$9QPtYOS3sPulhwqsMmsY&><qh_#
z|4N*iMk2}xS?j@cDKT?U4T2Kx{-$0C0UG_u=w5OsUY~^^mdU{3B*&zumzh}ZK*G0^
zw-t=HS=XoAA(^X>r)TN~oU{NGLL4b92^92d3|_Bhro!B;xWkUC+r<rAoOuyx0*r*d
z)$5CbJfUe-3-6+|Hz!K>N~8U27v<Jw3C)2kj+>MPPNMHq(BB-%Cn{wt%{Ma|A!9{$
zd5BqYF8RKcQ_gn^9C5JVUXB^(GpiRwOUM}t_()70hN?wqkIu~(jnQHeHOz;EHS;Zl
z2a?ZM^&JJ!NEa?(mdY!%PHa;bw|RK<FDA3VCad6sKxY2=WB+kv*SX}IM)(x`mdfbY
z<M>YNS#Bn??uR+Y3dfsbYg+odjgPTy(`@Z7bda7$bFuTR&G}|EQ{MLCWXX-UgfeWY
zl6XpaQke=)3c5WMP~Bwv#;5{=z3IJSIe{00Bq%1*sHY$T@M5}Q2iObIrD6*HN{Uuz
zu7Iu&*+E`@=qEOcX<%S$!pd0(5l;7W<TQ*L=y}kM9AO4Es-6TPZ-NVoc}NjI-tAVE
zLrqx!a-ecdzn8#A59Tnh|JdW&I8e%1oGcNq7LG3ZEnZ&$K^xCUEi)gnN<do1<b651
zEpo`)=vPs)o9ez+uiO=;hMayiHCpIJNq9VarS?DBp&1<P6jRQ6bMDMP<Zf-6NNQKb
z$&e!QYa%O$$wWhr+vexAuYkLn3z2KN=BAy7;VIldu#F%7%)E3heDh)z@iT=9o-T(=
z#+wVlcNncOPKu<vc|uRB$^#$XO+BP==U|Ft*O>3Hq*R=@pNx#~ioiO-JW9?#+Gl?y
zswtwa`yI7oFB6|oW^b9e0B9&*vIFmM^1qvoNb^(ML)Gug4WItmqXoHP2Q2jSGCTz3
z@VhEH|M>kSVUx6%kn7!8>EQaPX3O24RqaO)^3xY_9Tb#<wh6r*B#7G9!`g9OyPsHJ
zZcWccyW{Z5{&7JHx%OYZ)Ua6iUvPi&k<~-e;0Ydxo7(t`yN1`i)}n;Ewy^HHyROc8
zvd@A59N6CnoOOQ1UogET&6w(K@dOBnVZa=O5tulN8M<~=-^)6^|C4zj-dX$Y*YliP
z5vwVv##~x)>flmK=F&WiD2%aWH)HVp^tAOYA*yezaWMlrQ<?a}yW#X<xUnTU8Zg9n
zg<mgRP<=isLWj`P*WhQ5GRW7~HJIJ?iq&#_CW;e^AMzF$UteTYejhKYU@&RUCe}v9
zHQRk}z0~WM`iJ448rh#ca_*1!gg*ke6*%$&;C^*W8L}uxZ~1zb1A9QMB9e`R?0JJS
z%)36JBu=YH8$SH;8@FpM_g#LxnJUx7GLz^y!S9e2km8ZZBm#w*y3sNmz)gX>a^Fbv
z?qY`j_F<I$p5?bT1*5u7n)k_?r+lg-1L`rh9aLp#YIAdZUGxchf~?%ZegsVBiF);(
zpFlg@diMlH`N@eNO|OO_V?`Bjv!TQ5EVC@{BJbPN%zDyguTQsrbM=OM_0^!upqajY
zBWkw#LgV{fm62a~<0hqGB->~=*rX)oPT9AIGUV=-xhXVrU#WEe3ju6+HC>{I>d-m~
zJ!Bf}d<eU+$HB`#{=1XcTN2^h*>v@0GNBY{djbfTxmlPzx)6jml=-Ldq_oA_4H}8+
zkG?}q?(HYtA45u?zro#ho;oc044#fKE>?XYMcjTzC_wmZuyM02H)?snvLY6Na@I{_
zrTWaa>=CKJFSp{ko5QckFehajZi)~U2Gmo~7{fM!g}7Cnxc$Zr*jpIq`gl7>@*Gg(
z_tV@=j*+XfE$1JAFJe2`1eX^Gq{KYChy8Fn9vnNJjBoumBVyrZ;wsr;&9&WQrd(A~
zi>ql%P$;a&6^S>x#BcSx1p9XV(stGJ*n#IA&y3PIFYouKrr>#P|5Y7#6H^|%20|WG
z4{fZtbELa5hVGbpntL~nsUO3+GgQj4TRKY6K|1nKfr8Z7La|ghS9oSxLMdB*cdQd%
zIMJcr2TVcO_dBSY)kTl!dhnW1H=G7qTXm>RWD_G{<8SUjH@R3mMClC=@8Ok=_>I?1
z8afuK<gnFuBN3yz?^6nJO$L-xHTMmZg-L)pEq|Cd(zcgSV7a$2RpY-_s<}7+dXD`U
zuGb$A0Qik{61-=UqdTSSsz8ew$JM17tEV&jvuuc`2uZq1E^(T|+K6kXS)r-RC%hEQ
z7-g_ND^Vx`JqtFdALlWc#v7yU8^XN$qA&-ZJyN`SwjkwLv~Ebpl0DB)iYuc?4L-BC
z4UOhVt4}v*IWN<B+h^6ApijXkPCQ=JSUy*eDDon`B0*x(qdoCK60D`xE7;g!6==+2
zTiz}Qd^`E47qglPI~8seAE)`ZZ`V<Bbz4};98AJ6oke0BySMt4U7VeRmMo%IzPg~q
zpHuhicKf1dk@o7cDnwQ%Nk)*3ncHG&H`yy&NEIh*x&$b4CEv>at=t<kYN<Wf+JbHl
zh#Wq|-Qn*28r<FS?4zf5Y&2-qv{G$VIWjC8y>D}M<_I_pf0t~b(Dujmi@`qXWGb5~
zyZds#3<}A|S@aGPFoXY8K#h#HHduU9<2t=(MP<+iU;ynYjT}S?k{rS{fA13F(T)t{
ztw1`BncBRhxdVv5)VzA-=ru1YAhi$ju)up!{qaS^qlh5Mz(s%OI(pECC3sBqpn-gk
zA2It=GMlK>D3ZV-p?Tw){lHi(?$cBHD?0bnXi=h;gh8TW$iKwAgv)>bN+C5a_JUNN
z2~^T6mZ>=xUALV$>llzBY0CWXQSx*jPmacSG+ifMsu--4{=mM*YDu|Qr|!C{Rzr$D
zdELYsbCPh$vea(Rk0YS18;zx8W-765=cJGpRV`46c-&MC=re?G;ajnNEvc|uvb!x_
zMuS3Euf-HNGoZ|~o)j8RyS9<3zNAD|?L;p(pI;f@$OE7%;&)IOfkfn@3&)h>D}o@B
z4RTTe0SZ5|GOc3hN4Bsg_r+Y<29n9m`-Eq<-5r|#gb4I{aRx&8A+$m>H8TG$^a8nH
zhn*lgvJh{akkH_1edMEp&N4j=6v-}c^k(6{xM9x=Xx=kf)|cwxvtybd{fK?|#d3ct
z51|&VxeqyjNG+B-+-a6@95^<s)n|yV8SD;`gxheyo-cHIdO5ou-jX91*X0*<@J+kl
zY?mCTgy9wwdcb>@xSwGdd-vsvKMO7>pE=9;WloXX2*sFko{v~C({q)`PwMA*o%IdI
z{847^Q)RUIE`D3c6YsIR2-IMmONpMns?`z7oq8La1Z+BFL$7C-j%}i5h9NNNN5#nn
zt-#Y-kZ6WA_3%wV%phF+1Z;W^pQP&!Dd*|V*u<;#jS7*0ze!0uDKTj>nXjRi(+A&A
z9}FM*5w0J9_tba7G+rbkE>KQYQX}6oZpCp?GVq0C+cxU+>u;KZfE#_~diwbA4%6qp
zJ<6t<UYmW>g{Q)ZCI|J;6d&)V5pe0sElpM{<H&Y9<xqnM(8Ad@_;YK$x4N$WDBGEu
z!irEw4A+2f{4}LA=wW(JqDZ-dbKkUjd()|GS?Km4h}mlDN7|kl6VJ%Bb3eTa9fKrX
z5oy0fg;Kw3VqM6F!-u~G!2sqNHpjNZ(mKm|I+*_iN<QLl-Tb&<H4lwIa)BDn7E}$}
zpyR5wZ1X#3DIGSaBsQ&+$!8Ok+Gf)PBdbJ!JZ<gp-}9Z9_7lK<Z;oG`OLFY(V2^4+
z$>4>492$l7EB%kh*)rT^Y*T-ehBSTNAcrsNuwzQc11ITGvKrs(N;>-TW8cL_T|~Z<
zO(i-+ZyH>w{I(x&3E!QzAGKcUit2bbj<}7$2k}wcMq*fqwK|=dX;S~1ANFlHwO_{_
z_osVO6q*4-`d#6NX!G*LD68@$Vg@+PGYm8gUetIh#k{RtX*Q(eYjR*%TlI7kXH)hM
zLjnujWI#ATot7|kLDG)PP=e>LYv{GEao=`LUjH>1>@(7cv1jTW(FQM!5SQO~q32nk
zWS%1lMK%pL5A}KvIEA~B&=%$4D|g}zH(T})er;u`dpW`=AO6E|mHai}&}(tL>7Z9H
zYqu_onIp1f#Js(I=Z}F<)e?RILz<8oXiUGt&Trn#a4<`|mp(o!XFx56&Ei9DTWDy>
zxPG`iFb0d&iQ>4q^%vNAOkeyW>a(-vf)ui#09UKLLbw3QAG0bMk?YJtoC6^-jXZ_=
z!fJ|!V`77oTIWe9tEGH)7xA>L#C}2aE@pZfItCk*PjH;5>uESJ-unh1`m>NPznHr9
z>P;|3x!EQwPUYW+@={;MkM!i1?o{Yh<^?Vd4gds)b~wCEMcEYe_-k~p2TIkzD}tW;
zfR?(7^IEj6@*y9hyoLZ9(7_{ik;u^58CQ;*dFab@i-{n|Eg1?Na8l&xQ5pF9$?crn
z{)=Z?WPmwz*ud`7q{!`B^ZBVG-L*7#Vwf5^LWC<i0S^-*Q?NW!@xO9cZG04z6!>q&
zhKzwy>_nof@Gs_I1;e!HOF)<;{8CUN2buzBFk|AJZ$sEaz@zx&QbOZ=j$3RJjoWE}
zs#j$@UbUiSuEFh_=O_X@>m155j~~7b2#s30G;`^p9|H~W3Ub{IJ>Tonz~)AW1XN&J
zTfow9|5V)_$oqOln7%z^TD7G1WrdAr2;(r6__``&j%6f8BvrBQ(a~WsjAfvikw)MN
z?)j~2zxN@M^7HxBbbP<uFdd?ElBSwlq`zYJI56Y=k07tN1S+g7fiR>eYh8!d1*$cx
zEu5~JHk8pgwyD*`Gm}8oIJ&j2^Np4oNR+`_##Rm+iA@>K0~$KGIP>*&JunWf40~vs
zl`X0|zc=kJ>zm|aT3tf~<Qv#si*^wMazwqb7pje<6)XPOsw=gekcw^_qXuV{GQi*~
z@cm#SET(K@^hX(?1nS>zmMFMjd^S~cRD%oIStCbRM4pqsFD`iDHm`mAw@ik3%+AG7
z&X?+nk}=50d|=k3zV98BcuxGvh{jTGP6f{co=r+jAa<Xh!Tj&+6tlz0*pW35R7l@3
z_2`+JC+u(sB6$syaiRC0tqy&cZOM!T{q!1X(6E2-YYqcXZgzXVGWSGFoj^tF*few`
zh7c7HD4Sb6U-;1Jy(wK_?>?LR?O<cmSP)jS>HXaK6LYg;G-Y|)0nT^$Ag{ig!yC`A
z+%$-Q^D)RO&!?%)fu!d|LRQO__bthe-}L+)Otoh?(k{Wm!qTC~k+Jl~wu{O!H@gvc
zR?N&)&kh5y!jwU>yt3rONr1n?@&4Z45|g|!#MCnq1He|sf4xaK%9En*_1|;Mi$C_E
zMB+ZXCmolyc^}ea<KXbdr&TXDonEdkV?5Tb-#;JG&VJ9cttgQ{ulx2uMhPyUKyq_+
z1^|hQ8%NL4doj*mZ~Cm?(?-kTq8L*O^I9{S&?X||!Yh*{qcPzr(t!a?6pP_w5vvx9
z%%*hME?-Q%beuK5{P^utoO)B6mu~JVZ2ZoueMzg`<hbkctpAOJkF72933Ji0dC^`_
zuV&%xMxHGRVk)(yHkoNvPxi(D+qn6dL}XpR<h*ga`aY?WydZJd#$Bb_@ou-XtooSM
z`!i3`o~vX)cgZ(WHrdZ<i$>E8E*i{;`!OOVANzbzYUx}h6ya26&b~NUm6iuQn=h=a
z^<q|3dzKh5*72HOU-7pX66T=m*#%j?Z-gsjmRnnxv=Gz`@b_Yv8=k@6;N;I9aS{A!
zgFpyhsW32$o;C(!GI<_I5hj;aGs#db|6`N4;ZYe3a~Pe&BG7FppFi$}T4y1{xO0Yk
zdwU6U^KRN%;+F|Kj@NZENR#Ni`B*E^qbw$wT-a>3y+2#30|>}gJh`$XO!GDP$k@V%
zH2>f^=R2;`H^A*yZ703g{EZn-JBs=*Nbg6+-M2hqVHmSwc?T>0;3XG)fnu0}N*N_B
zHh_W>(*RvZ$T8oInw<<joKLNaUQCtca&{P4)~hQvRZD;KQ$?CL+vJmnWtK8^gf;!6
z0oGHg_fpbURLzTs;7S(+101vjS9@sC)zfC>xNR%FVm{A)T1xKMOj-&^TTN9IfvLd^
z=ZwutwHT$}r(|ged`qjrXPaSbK!DsEWpwceW&ZYTmr*67mm<cJK4QBIVwN3CR)`4+
zIDLP=DG3~rPH-ccEZDdrXl?JhC+!o5h(B(rp8uQSNtJLmGx;eWyN!u7r`A62ux>vs
zh%p`ib(`#{q58wJq|?#)+M1ewgtYU6!Q89bisb(1&;44z7%LY~M@^twkv2R#H@PsL
zSTue!c?D-)iIevk4-Y~vYu|v4$!n|CJcW;9?Z22W=y~8TwGcsxwnlT08C~o3Kntyn
z*6HFL<rDBzs??nP;^TAftS6^LkLO~c4Mhg|&t^MZf{>aB46b~eEQrV)at2$LAbpvk
zImuj9Gf*u}7n(v={+N>szgeaSX|u!2Csf05b~iz}vu6D&sSm;VxKrqrKF@BB$g?ij
zQO2u3=zI#16g7#)rOWPFt;T0j6H-sluuYL}><hO?-;K@JjC2tCgO$;MJt<s!bdLm3
z`KOLu7gx?Mg^i9-kC4ZfNPfO5bpHBzzilikSOb&(<6MUwyL?*ErN4c@<6s55KPu68
z2MKG0KN*Rf{V9>IOqPDSaMrXvLewj!Up5*pwLgzn;SYeBb>Pll^VV{opVAB~ea$2a
zMvYug^+b@OwUEt|FfS2JC8$C>B=c$KIxkLQlWviPX6+Y`j^}DSHkemaxpl?BZ3{8F
zsB`h!KkL}h$-c`e0ZXG<`fV7wA<i>qB42ve#VpKtC@dCwKh#_Ju$(|V>`Zxzwa)Vy
zSq(DDG>5)mO%epJlTPyH)CjKPoy--lw^$(*<<vVgf3X+(!c$MhmB8be(mOIq^R-rA
zRA>VE4|>FMRnuR>qfxkLP>;PhN`0PQP~)*JpQL{&PJn0NvfM&@&w;(tFlt7_Hkh=)
zA!&mBy$&KDv-Kn{5g`$wHlcPox)vdOJ5iTgACe+cntf`b4Nyu-Qnm?R9S+#Lgd4TB
zr0pAvfQ~UBn}IF-AxC%Ygo}H9&B#_DP&|}F>`_49lLdg1-=ucF+7-I9vm=&a8o9Kd
z+t`CpX>Agcsn15nM)a=agfS%!d|S_6dTa}Y%CqUuycdiwngH>)```bfqM=#o-5&X9
zkR2`!<T$w-B2Hy+zY@feEA6azi+RWTMXHC=2Z3^e+uV??3b)WsJy|NbFor5W>|ncV
z-O36pF8To<(z0hw-Q|rKWfDU=+wV58hSNz+0cU8>9?NU#E@k~QyqT=f1N?{XJDEYI
zDYF~YK0?(XY<nv@SSdKPuP%f#f09SFtglxeSjqq19Ao`M5ILq4*a3xDnv`gv#yB+F
zi#0fSGam$|%Xgv9Lf3<vpCS4<_cgI${!A$;_k>Rh)p{B9PlD*ZUTIdJ`{&sM<6u6J
zus4Gxa3L!ycq?v{VlfksV%U0xE;Hfhp2iN@O6x(X4M&N^x}T`9aP6B_o2Tc-+K2jC
z6;E1deOdb|tx04=W)TFIP;x3(UeQkAiTWAa51zX~Q{-|!DKJ}fL>ajIgW9r2&&<<-
zm*1FcRoqjBK#XAzcK(Q|N8H<?Pn+hV!ET<Y;b2J~99u?MbvBL|!BAao7II!|&g#SJ
zA|Nb6=n>>AKMAg@%rY(&Zf)%S<)BU}O@iWVgpoU6R`{I`Z7v+4EPo*PcwL~1lHc<q
z{Qgma>RC>Hwg;G3XSfJdUe5<93d({Y@KfLw*@#jMThuSD&d$z8!&_Y5_c2y-kzl+X
z6q7=2s`So;7@+nlQneJ&A)YpOPQ+t-kS3Q_=@e&V3DGP{*cRFvyyL^={JU;SDa#|I
z8TPZq=aRW;h11Ni(1twraL>)MNVAa4e&H}v0_k^Ar#JSLaPOk9``BiVT?yuO7@T05
z^dS2yX_HbBX?|N=Pt`9pf_}J>hN9o3J@CdcH`X#+$=kJ=Te7@WMv)Y8(!zn*tM5lN
zbsbQ;_Y~&0OYjG0vaSw2<afZ_{#zKd)4Py&#F*%6RABJK_hVYmIkVl6lGG}PFKHUk
za%?>l&^2Ag{IhhhVi`~NKB7__a%!fE_CzbYqLc-CdBkQK)vO3#Vpg_qQBbBEk?}z%
zgV~8&*Oz9;x3gDo`QLcl?W?DSZp6kCJqp>LOz^C&q7%FDQ>h=VoRYl`1qWjxr4x@G
zd=UBXv*iHWvJ<9*fuT~ize{A)K`GIiymGA6Ba?}(FHMuEi?JCMk#1O0?%o}!5q?}n
z?Y<<lRru4LD-_o0%w2!#_&paqS^|y*sROQlqj9L&769Gb?2eI4boUaq=Q47y1Dqg`
z9bt0*iY(h7jL6xgzfDOS94IJ;)qVJW@z$qlq=IKfSkk$S@XtHJgqa2c1_G^vM_n~T
z@e?Rbwpx6lIxPv6lIpQ|B36W>izPPPU#_$0xpMy*{lM&0>UiKY^LedwK5V?*shHgf
zLk06^e5mE|-oF30TWuH6p;O4NpPR3!R&h^8g2IKFZe+=RRINZiqGfxejTlUk+FQ$p
zJ=F>x%wCTjoU2Tcbl(VCB0JxE;NgbybliHM?W_2o+8O(Ooi2e)+w5g!o;uRv@q*@4
zlRv;XN{T_Hwvg;=0~{QjIlr2CeQj-rBc|is>f5$Bm6?NnoKIEIQX>)p*%}}O*hngr
zE$|^*V90)-QXkdcHYCes^lO@xc;31D&&|*kUC*!o&X9k|X^GldOM6tDSx1fI1it(C
z8_uyWXbHa%`)lw#Dko~Mbs3qy-*kuh2U2AsQCE@DITm&SNJIz|gS@OV8XXao5@FKZ
zGWttAkKcsQ)>(5GQig}$%`lg!@UuO)!=BNsvSFN|Vz1_B@u+Lx&T~}-Du;$k%#;|N
zcO{EwPJk>84ZNh(dU?F1o6fK8o<<?J_~xq$pANagHTY+6L&_mTq<f;>m!iezet2y7
zMd^cPT#=DV4q4?v5P9|LhreK63C1s|jipo}{GjD@zL`Yz=#xf)uV)z=uSOGx%0#63
zq|P6&TCS#_TkakrouOgo0*r{>JmlJl0zg)JLO67saC7N7lAi-j4<)$s=(J!&3`|(?
zcPtEn9D=@%+5LVU*&O$<)8CXN8~-@<R^7Op*g{L+TQBGYP<P%~VuNHcT^{uNb9Z(O
z;D30e{J}l7Bi3x4VSnwtX|m0hErH+DmJujnEM-sUHvV2}(=dzpB||?GtZYk|AFyHP
z@tdB6%P_V2I68|k6l{=`igFkk7o>%QO|p;hPG0NhV(%6_ZJp!1S);-K1o15n($#(_
zGah^FF+BCuQ;5@kTuR>WT`#O-lNnemTT!{zi<N4QOJ>MLP>A3Tm$>@Yw*XhK;J68}
z!vl;e@J&RB0VoBQM|e_17LfE{jBvpaTZcFc;FeIlpmzniBS>dRruo;w001BWNkl<Z
zn$Rk6o+1{bBKm+4f|I4glM6t;=@PEI;Q{cJ9h|l^&y;FU`w8`X&eQ?UG9Cd#N(s!2
z&wS=H2qB<M1taI3nHjd*EmYM&WaBtm&RJ`ITy#vME|*JPEEdvstu$>TM@L8H=-iPo
zvy>vbv#YlnvMCXXb4~!rbcd9??z&5$EH`i7EJP&UdFk3tPgX0vb?cUT=Z%?-m~Ff5
zYsJviybnZF8TaSUpU26`3MZ=*G%-R%;oRv3Ilc2IHvd!|s@1O3su)`hqI}!oc(cLX
z-}bF=qv4PL@&AF=4438|hLYeNp*wd73k)j-W4}ckeGS|QRS%-#+kmKWp~0X6AwwHy
z;C_Jg31NN!6a!y5kFWH{$lr7g-~I2u8+83ThG9S@e&W=yFI>Q9o;rIo?^fqNPc8*d
zKlKzYT)2SXCqt7%vurVIX8S^wb7Vj@aM!iUF6c0h!p!1>FJtQE-uv#8%a<<;0P)@n
zGifPB8B@!KnU$Hv%!;a(wr$Jh%a=>v52cA+nRSa|MkS?En%GM4jg+DauzDA)WHD2i
z3J^koNOfUd*WtI{``dW>nP<?p?NpL`2{&dH^21ZgR9pr282~q7ug89bg@EiC7vJy@
z-t?|_U~~B#R);g(X+73$z|c5s(umEl1ve4SdytzN4!bW$Fz=8ZBXJ$Pq`||@55Vml
zS_Ek^$D`{zNcUdC18@Ic_`A+StW*?;z1XgQkz?0+DkY<BTYTZsNAbjyPoilWgb?;%
z$0^f+h?s~N5m^X9o2F4_R)fhjnxFuX5JI{C{`<?7%U4QDsfZK_A&8j??+lD-Dz~bN
zs>*yZFPAP|%Fo@nnTfcJV=6>k*6X#TlqID+P46ZvMbtSDRhuT30x4y4uHu$%+_-_y
ze)=<5uh;NCyz~XI9ptAPIdcuRY<jIlfHw!Q!>aF54wtz4Z+;K%{ei!ZFGKNU8}M`+
z@gxj)*kOzf1~rUoDA^!cP^MF|p%lYr7(ndd!wlPOI2Pb!w!kw-2l!KOxO4ASyx|>h
z$JMue8@8gzMG!-L2}zh&J}SN|!8wPfY4D!+yl0OPF|!J)m^ya#+s)YVF2z;vy_8ZU
zjY*oODKSPdv*NrfmoHr^ZQDvIMRLx?OvSlrPbMOra%BNf%q+KUTkgJkt)!H4&LyXm
zbBxU-BSdBDkV(!(`+hKhw3OOe8HT|`WWWC|mrH!)BOk$-MuhOv)h@=w?%$;{TvziB
zqKhP0&X#q|PmGY@&|AiZ?|2*TdG|Zf-+K+8mxQNdz-l(fF?%H6AgMzs3@r>R1S<qB
zfEIw&qhBWsn+$awR<Xkuneds$;l^w3!K>c&L%8s^Z^I}6hZ($ilp()tU;LGfEFx&T
z4!3XL#)m)rVVpmAZjWv~IXSUm7*I;BN#~qx90uFvz>`9*IPXeINpj9bN+~(#vRp0;
z5tSHYan4C8BFtR(WB{tF!puTMQc5YNmakpEo@cW~UavPfgqVk6%w|<Ds%h#SV+H|8
zRn3Ulbka#8!h~On7{)C=_qorZ8vdnwu4e)DMu6}XgiXC>8w)53LTE8)!f_eVkU_}s
zn(zKAxP1Ss@YN4}7>|DF!+7q_9o!Q;I5C(q8e{C5cQD?o?786Klws<yQpFQGV7PV}
zcm373;hyh!7|r#oxJ3lc244(R6pnX@{J-4cy+;TUAN$zH>NV;*lu?jNhGc<bZ_E{O
z;=Q-(TuoI~N+}XT6cEZV426iYNXgACmdlqf7r;sgp@2kGMFGez@Y;pjLPVvMQifs3
z4?J*x{`T*9IDhy<A5Pu8&EENZ{pec0b?a6EtTauO`m;4BYuiRel$xe7Rgj1`@0mKP
zz`lR*Kl}sy!hiP*Sf8Y?caQJ?e9;=2u4h~>&<|S_V^FN)e53(NQ6wT9z3N`fFI>dc
z*S-NaANdp9{M_ep=jms07y>#UD%_eG#EfE!q>3bpp%jq!IJkBVulttQp?m8$qka9W
zF)TaW&I!H{792n(U_a?E|0TG|yQ7O8JUe{w10TfYi<hxo_Xr$-Qd^%64kZ;!!)Q%x
zjhHN@qAI4&vuuZ<n4x$dvYF=1cAc+W`=)&L?yFf<vPdb!JSp=*J$5w+B30EwM5Sq(
zOoY;QA-(#6d-I1r@`0?#X)Gz<dFE!G%@#SORIFH;&t@Vei4Sn=^&LBRcxWk)sOpWi
z<K|p|h~QJ7`V)NWkw3v3-}rir;}(D+=Y$wTt%Q-o;3tV!HN?CJH(_AFL!k}BP2r-W
zT~x+MA}B*a)6Q_|t>20Z-~25ow{IceKE?-s=XY@9>1VLrY+zDbLu!>fxHvq-{SQ8X
zH^235XzsoSx9ou6F?fTF88fRAQc#6CKxh)B*>xPIX7LV}Hoaju#~8-}Ip<0pN*P52
zkt1U4@PGdA|2IDI(NE#>l`ANzzyt`cF#=4Am>DeisFJm=Mviryub~*M7+E1kHq-1|
zm+yb@HR;M-m$I0Yl1tHIWj32h-*3e442;tne<7kmM9IgHA9(Q9>467dot}E?nbdWQ
z)Xlm?Mj6md#O37Vj?8B>agO!yaG}R1xA|as&P1!ubIxkZ<$~_Iat$}0dj{|S-S^}5
zZ+snMXrWfyX+#dH1?(AV0ubyfUAvX6u1@CIrCbg;gZ=>61&Cy<OR4%)O#tq?47z*~
z-}ly^0crrT$5Pp3<RXI5HZUTTam1$Yp^{+5;CWZBoFem6?7^hPc^3R|`kKKi&33tf
zsN!V3+A$;0wjKWb%YTmFd;jm_+`)OUGMdm}v)&@kno0mLH3k_IRM{%%oSkrR1&)g4
zK0D6|B-sa_7tK6<=XZTacEROwJ5KtVBvK&3H?m*JsL}OKFFBi8HnVi~>b2A~v+>4_
zo9W_3PB}?paLT#lwrvXFiYa8sqj*nFis&$mlnY#p(ae-Ko6S^OBz){+AHzTUjo-rC
zf9MC1#)Pixrs4={)ES$<v>V*v$acW>T~3;|+r5NEjB#Ic-U+RyoUoh!u<IiIMJiV>
zCCTU5Ls+qyXhLn<?ki$<ZlB<Nzx%s*?5khFl`B_}bKXs<vs$ed6Vuu~W>%{Lfg)C<
z<WeA<vy|j~$YV+g1?m3#U!C6Y`q!tDOIFn!Ld*b_lm`hR$gXyMb~Wz}Ek*K$3m3-w
z?!7N9=F5@EjjA>}=Tp;kIcLr1j?NcmU(87QKIw9Kq^4$-fm7?QIcLi`W4T=7<m3du
z_G|wS9{ciR@IFGs_5oQ4@g<e`Ug^S@Qb5dzQ`O4=<WexEgj`BZ1+)(S7*oPH$u6aw
zktV$K4pr)$`->TQIt<T`B}&O?ng(giD57<2pc<GwKK}8K<9B}dcM+O^VeB!C1NyNy
zFpx{OssL$*N+DEYC_5DAxv+DY7`bhm)HKcL9gn4y@!^LbPCodQOG?a~0Tk!BsA@42
z-Qm{Gx@(zMaaOaWYU$g*{oBX;?z?YHDUXZAG66gWA5+_O$&50yFSBkbO`M5$jd~w7
zgs4P}7^BVSGsGCNTrP3``~{3-!tedw@1qn!?G+H3rhVD&&0pjqKaXfOH9E*~ji7@E
zdsjPB)AK&~eff2F6YUxU%>0VYl(TR5tU}+e!4P7^d^SfOGv>1eZr!|vkALFhFfv@a
z>k?wuAT%Dcc?b4v?W~0h&RlTnqEjE7_~?s^zWCrX5oI$=&iPbIPNkG_u~>|6dCQx}
zl*YtNiO8}@&ZXqyy%!>qU7mc_(7TnK%q-<x(t{5^FuwlvuN#SIjG-A!F`8j?&Zlum
z*^CO2D{VWMoK=Wfb57PY(YmfPW@qC#T1puQ2M36;!6!cP2tNETKZ;TW&PB}UOKi8p
zUuqSDP9+<67Z|9i%B~4;Hm`kQ9eLM5+6kuF1iyL7T=-0<>@0I}XZWUV>+mr#Fc{HC
zY}Olm;1B)~U--foad>nHoj?s$4-r<h7<o1yy!znP1*a}}Vebk#mwgPWY2p}T7(;Ml
zDS7b0kKg^>-!<NS_tjBVM(11-kxaxTrBs|_VW!iSOsB&t&g{#Y03Bm&#y7p`P2<7A
z!LZqEM(_Q|%%g~=#o{2v(58}0A#mxsnRw@?0T|Hjc55l6UAfN2aYWNJ*lv6L`mg^w
z9)0u+2tMNY&Kd{H!<XyQz3jn`&vtG0`|}PbwR>&1I(IF<9lUs_n)iw<j~5slXIAj;
zx!M;XG_k=rjBq~SgMaWZ@!sElA4E=Z*PHFe!ZcW{n{}2;p0amSgNd4zdTKU9GFYnD
zU51p?&@^%Q{_p?3f!Ib7Nu`uzW@$E?WdNcoB2wM8PJ8Fs5pV@S_TDEmOPlR_eDI-%
z2Jijw^wUodUDpkp&1T5C4D0oJ+-x=(;5?40sHl{pl5^J8YNg{inyMHxn~FiDmi1zc
z_}bSV$G`X&zmKP%eg@0s0tSXz9e6p8BT}mQbSY(zY<#JssA4CnvX@pNfS9KhgZ*p7
zRP$Y?X*ee#OeBCEvSa7MU+Ty?Av7L7dTjb_-PcV)<iPCVT|n>=%jFSPch-2%Z~P{-
zDB7l-0x`1?B67+GBNH*JMI{wxCjb{UD`u7ePN-Ad2JhX#%!6Y$Jn+B+!}aUehSh2{
zI_E~fk`FGY)Rz!^nc&~*e(vXfc8|8%oivfrr4%QszG)h_Sj@wvOPBpeKKjw1#e7Q1
z6Cn_hS5bF-eCz<Ye!FGSGNDq9y!Y&!BURZW5Y>b#lRn~;pL_&46}<7Azqxid7`S=s
zIn3vCbX`}YPiAbl+iy4^+Vf+k$7kK@+1I||?E%1S)?vL~VZGVl!i5VpOEAMYjF2L5
z&exH=$1D8Azx(fDb+W?!_dkHApLrG_I&DHIjM<r*DS?#8scMahm|Sws4*+`aea}oA
zgRHZp_05|%Hb4E-e`j@Yc(CreW}_-w5PD)7%xom0Tu+q!@UJuHSs6yI3b^LRar6&7
z@EZU5fAy&U<3IkBaQV_D@0|Cl>KwBV!8z~ixT>aUShTQeVO7}~m_&q_nPP14+;cZ+
zKAU5?IKXE<^I4Q4c>OoO4k0+qW|cp+UazMMI(y}&JiXFM`(lNi`Tp7^{KiX^3I%%y
z=N(c`=!fcgf)AL@W{6FT=Wg7@PyN(SV>z3n-wsd_l*)guC}bs&kr7z6x*{c`lE;!&
zEO~Mxfd<K?&pB^XP8)W-e)idC*5CJie|`OfKlFp^Vc4wAbPHe$pa)?DA%QT>Zam$S
zPXpAw%eKOfGqI*zhGdopRT+NdN8T|km-9a7)H8E0B@b#c92_i15lH}Y&MABE3K0na
zQLPkz@4bZ(Y#c{ixNyO0a8vioU;p*rz%Tw!zl3pe<=gER-h0euGi)}SS9I6^Umv@z
z1i&88=6&UbvGe%jPyI3e?tl4r@zj$~;koCY!(zTf8ZsvBSFkZir?HI_7eI@N3JQTU
z8zsp$mLda`1}V~e=eNgq?)1yWqJQT*-?>#OJuwX;WdJMzmZx(!8)|abrvo{G)0IpB
z*i=|FGXU2#jVndmmAme8tJT_n_OqY$K19D<EL;eF=e`{?IWwK4N|<7dJneT>X;+o?
zH;##7Y>-l-uA3o*h({m&JnkId#^uWwarNp|0JX_c<tXG8_sN$#Uh3!ShyTWYr@`Q(
z$CyWi7{Sa~t=7{7b%#%V;*<E*|K(S4<LPJ7wH@a31C*k0>`bIi$1o+6qGk$ZVr8(9
zp^$MM0|XvTtT(kSfj7?chS=7t&B^NR?|A$A;fLS0Hj_0uY@BmjGpmEM2_vSdGL>{h
zvNQ7O=RNb-pp|z8b0Xq$6-;&a-g~eAvp@ZufAYzv{cP4bn7QNQJ1)lH2yo6Z8<dHN
zC(bih^0W{DYTK5o`*l<U9j3)%2`0jq9{U2m_{B#tpU-jS%9Z^j)Kbd-uZ#=;!#LF9
z$<$RcHT?7U|8xBEKl&Biym=F3K+b}$onstF8-|47V<lOE)zp-T)w35zTuhOnNG2Fe
zsfSrlMjJERsLA?xb!YwB*S&W2Z~r?#zFsbuYt^zAEnAV&GxGpUuDZJEokv#pb3gkt
zyU%*|b5EjqlW;YNnH{SdJNEA4`HRfXxyQczWhYV`6Z`pm=1M7!9dnG4%@Nm`@5Z7^
z1|uH=HC;m~C$wEhK6uoS(m;+WHXhD1Zrpelk3IGkgy3=CefRB!!RwxUc6WJUt?8wW
z^-@N*>E~Yj8+Sm$7k>e$OwQP#l!7L9*lafV-~QKsg7>`VJy@^nID%$URT#%)&O3w<
z%n0U!H}AcXBV}e`=3=IqnX~t90BitJAA{e9;5Wpy9`msB4X@t$t{+*y>CJCii^zr<
zo0P}CZJWW&#>vQKZ{#YtZ)aEX?kb(GW~)+86WNam?3le{a=ch9+~ZF?;lBK(FS*!6
z7n{Z@%!!y&m>bK;=82Vzee~p;NaTn(I&8-+?Ld0U3JOHZ0uGM6bMPVJ`1lxK``Y8!
zZnrpp;Q}sPJP#iOp1XMi^LbaX+-zV6h*e>ioXg&=@ABYNjFj6yf7a+`R^hnL;DfJB
zMk_E>mHaXd>2_ffCeIbY;X}Z3c?jnM9)IFV{Ng|Shj`?XM<6O#9xUO4M>A`YBw1(!
zIFQ9zH1cG=i)w7DETUw^SPKVAE>Hr?V5~iP-L|v1Daac*U2Vsc_5BaMdi}%ie8)OA
zVLgn)rfI_#K<}LI&2$7P1H5z96EmOeh3@)=#@-pYcG|&21P5a`pU>Qd3m4oMzw||S
z>((tE#?cWGhtRmtL{28`LSPUxdq*ImR5B4W+O~zLkf<Uy0kMf-=V%xPc=lAXpzG%7
z`w^db<dgXHr$3F9GVZ<S9$dU|VM;*~K($Ux#2_Oa92{aA@`)HDVvJa?*L%ZGdeVCX
z?*b-cny}YZcT-jCgx8$mn@UC-h5@PMDxB6dAPN}Af<OABNAQzB`L~fq!QsInLTE5s
zERah<E@DmFKn<3q)}<+UEm~Bd0$3r3Oo3AED%qfrK6Y_CmSG#BTeHKun>VX_Uv<yw
zr~Zq-y}JAQ)zvU;H%${Z?07p2!(e6uGiL&20u=%Yfpj`ww35#nn*b2=E}^8|oC*e*
zopbK`_3IpbaG(9`pSfWec(GWzToP+BhB7;IgksFfq}d>&5Synqbg%-jIz*1-%mKnE
zqtL8fqHAXu`jJW&oI5;^&1#DeeBcl9$R|FDqr-Dp%nz_!9HL}}qktx~HH8@qL@HB%
z=ttySaCmS8(^`cJAwo)R7)(O6mF17R`hyQ}9KhtjR8@$a3n)25)i7&2%(^+&s|`N!
z@jt<T{a^hz_{7IPiP>y{wwYtQ9pE^kBsCag916O2Zv7@1kuxc#Osu95A}*e}c=p+|
zOH4E}^W>t#b{vQG;nBf5<+N5Qt9Sg!J63Oa;~UnuZa%je$8pm%%~n-=07Hy1)uPG1
zi+ENm&fG8j!hefl=wG;+X$Rq<Qz0HEBC3j%U{#}>Ghe;yDsMJxe&UHI_~y-<eC5g&
ze)gH?*qbL3W=Tq<L=cb`B{oLdCSr47bCiaRk_zRaAi5UYO^@}uCo+d7v^0(x<4`c0
z&7n#0Pygxvg|B@1tGIaaGM0-&%$hk=fy2Xd7{?JJg86*DZ|{xcxUXN+RD{^gY%<#w
zLQn@^i^60gvKygmX8;JA4a?;bo_gXLy!XBD!{7gV|0CY>Ywtx$ijzBQT)K1>W1o<d
z!jZS3&rpR0is<`fnoVQV8L1N~Dr6*9G;6V}qDe(Y$vQaZEfKaSCnxI|<Jx<-{@U06
zeEq%O`@O3l_<?_GmGZdu-fw2J+1AW@A{v}?V<{yub0#90PMvxZlLCSn?%cll!U&sC
zrxQBVQGdbA8Z$I7nwilIz{0t(VD<-hZXX}~(l7ne;RinOfrF#NbBFWx;Gk@E>DVu%
z$lN(M1EDRsG$Dj&W)ai4z}=7&0|>-CO?#o>J&6_!Lr=_vrj1Y)Y&ILTZA2*<uYKKX
z@#eRD3+}o18XkD)ejJ@UKnM|I8UeE@x31b8!_e<VSe)~Fs*Dc|H{q$&6igo8)t~FP
zJ)VB{S$z3RU&ig*$M}Qa{{X)5#V;Vn28;%W2N!Ys_8o*6;D`}ooO1tqbZu+fp|`ea
zHRYs%y@=)lXfc%xU?jGI91TpgalTfx#AG$5@x)9|9(w43<DdE2pE)^y{@h7Q<4MkW
zO+*`2-8$!bA{tUkDTJ_>p?l#<_5g5n?t)E*KHDCs15{vwswG>fPOlqbaH>^Yo1OW?
zqXYL7Kk*ap=B=CVGoSvnJG_3x=0J{^jH@OI5!tSJ;G9EBsnTVA^i~5Q?)x6|g9VK#
z!PF2#gC;Zp8A{HiD!6>{GS=%8Knefq&pwY2ec(fwFX#B7AN~PwBwV;~3HRQ69hWX$
z!g6_lqoX6l=+QJS#xbFrwSetv)BuygF(FIA>dp!`ZrsGP&)&d|XP?8(o44?%pZzm@
z<Rc%&g$tM9oX28z2quTc{1A8Utgx8PF|kl!qQ=v`nsc_2i#9&0XQ!JX2{$B;T_)p9
z>=R%Edko}g%S>Cbyiv8y!QsLB>1Uo=zwULfUH_e*{?9kd<zkad-sGHnRqbPp12d1q
zFeK+(i7|d%<L>N9XWMC$q0a<e%4X__ss?Rc(P&`QnOSE>b7EQ$XxVkM<rlyBrGsDm
zpMUY-u`hn*AoA?MlV6C~(g#2H&dpS<3n8@QI5x~K0u*c-Hb!;oD-#o&8LKLBRmdUL
zLUja>Qiu_%Wm=Vn7z2jXBio3RO{M3YJ9mV|Vu9Igj>E$PG)+~~?fU^oM~79O0f3YY
zNh1h~oCT}Z8mrX?>-7e!llu7R@H_y*!SWC%CnuQCmlONJA%w;@>kXW9ModU!vToKP
zrL-d}SO`H<O5&Xp5zUS$GdMBvNQ|CXdxLD%WbLC{Z^zAQJ8VuKdfkI3|LNcQPfo61
zzx!ku`&B8j3O;O@d84X5GY_gdib!VW%yme%ywJ!;=PuaSs}-JE&16KZQ(`?Ce^MGJ
zVwgG=IA-E;9Qbvwe~ACX|L8y9zxUt&eSYd|&(Pt)0h-wiDr$Y|EriAjL6eP&0`)$q
z^UhS%M8uk=aV3xD92;>pG$vXonL;EZZ3cMn2>?WEI+)4;FmSM}VrQH67VFgpB8p)g
zuvxEhbnYBfwC3AP=(-N$I6(7=#k>Q+Q|-Bda~=f7`EwWGeSl1Qp&_)B%8uGF3^+V;
zFv?amSxJHzqiy@++5{sKHB;i5utQOkB3g2cv(cFw`@SED(Yrv~aqKs-4Qm<8>gLUx
ztNUJc&-%xI{N3w&?!CTVot$i3;4Kk)06W7bGt17of{K&>dMnsYt@wh*_zU*uU5V3K
zo&D#h{WJn-n0zN9Gw0lFv)L}3<K@xO`Q-;c_@U)5|H`i{x0`<1w%wAM7eq9_dGprH
zIX4s0Zr05jGipkahS`PLY!<egjdQAw$s7@}nUP3kiF@zKdq+7Z5D`_?-5MAct8GRf
zBLGa`z*Fro0Q-uWh@fej{d3R)H?<tS_h9lE#|-ZR0EYJgLqFo+;Lwhb*J#_Wx_M`o
zQg6&aDaE?3v-NtT-h1`lD=NZ9N-4#AUqT2urJOX|K;}p9eBZ>dEt)s%Xp?1JKX>c7
zlULvWs@328kN@WCt>5;ot6YXv-}h@5cn!mb$@Ktw03#~1=Tr{%6c4aB@X@&o1_18o
zfBxs6XXLh<?V{~{YBgP`=SAT4A`<12z)ZxBDCH50<$~^e)pgu+?=}4C=RS?cpM2bk
z6cZ~rckUdv!`7T*EDx7POvsXrJ==1*K+$A?)T$Plv1fpciWbBe;DRI21c>(zA$oGb
z@5kST*zRlN0Kxkz``EVKqy`8q7E4r0&%~8B;Naj8MAe;lvl$K!4k4;IK3Un}(IMD5
z4C9D?=<WQ4^T;K^Iarawz-FNdI-k#U)33FgwbIU-5~45UkW(2GF;Z;8NQ?pCo(NkP
zc-zk6Iy8Pgq+z}8SF5+a?JcYS>?i-$>cNNZU){NLd(DnEF~&{FsShFcs&>}6`Rlpo
zoz2djzqo(=A|nI9I1aQAziDUFz0M=3g0vx0`@$lHVvLy2=UA<dar@34yZ^!0;QWOP
z_QVrUSjwYiDb{r@*t0dUF~Fc^#_Y^_HYtkWok>YpEanwtpoZDJ!*Y25HARtP#*7%6
z391uzS{>9a4yGB*bw$>uM=gvD!+^!&0Mj0i?Y5sPU=9a|M@S{3<bvhFVQq14wrIN+
z*RNm4YP+$LGcMkB1?SHl*=l`aZP%D+(RSXdsVaHaaU5m7SQJqyA;v5!Ij5AHSvR&#
zJBrB=W7E%<^S<fY4F}$E;B}w2>wes>-u$g^TL0*ey>s=(H@$J4b6S^D)@|Ev*6Vd&
zavHjBHker=qBQl2cd63u+{-+jHSkLsxota)r@8ajt^4jc#!VCJyd^2%$?Y{Unh0?B
zU03m%SHH$S|GCfGX1z8Ov*rB29JvauDlmpK?}9n<meOc324i+c?2OsL`C#k<il`AB
zwC;BhHP{ZF%?<!rDLS<-9RN@%G6iSNz8F%${%%_79^35(ZP$U=W3}0s8Q^1t!LaRn
z3&DeZ<p-yntmzs{C2N+fZPyCBAUPLd=Sv8oh-d*g5piPYN9X;(?0XRPL~dI&Z<J(X
zZ0p;{H`lr3^>_Z&zp{GQkG^a5;6o3tH|zD<OxMoQHs{oLZQC~?3@N3=&P~k+oDH%n
zZt=9JkG7jV&sJa8$U8%)Vc5eb&aUFqRgQg`aMvM9DOn5=Ca}i0cJabRT)c3}ZasU;
zp1W~d`%SN1Gc(6tp=3<XJO}NX&bFJaHBDpvL~w+4000eYNkl<ZFsdqyowuCDhLlZ>
z>c2%zido76Q!<bP!9ga$GUqCRJEdeIVj%=uEEabA_HEnMuiLiWGYiGk#*{7PY;Ds3
z%r=ap#Tcz0dt)XYQ?l8-)8o~#vLjKeY78k$Ve*o4Df9WFY&Ly%K8~swo%4eaaY$q7
zRc#wWvlY=zD&sn7T5X2S8qn3l-~Ml`e)Qe%T;FrgwUt5FrQ}U1c@tvj&8%nUk$^F0
zNzVISMe9ZB(q!cQK796gQQ-B$<K)gU*<Q&5`^htA>O_hM;6n(ploDf%P2X=@??P*W
znRjvKoS(6C^T!_h%KW!~^L_L8zVChWb4TarDakzeFpIIBrJOqgcSLBi<Q9&ih(rJ(
z#uxzjoU=CrtBUhJ>>4I)Fe;LHIiFz|w^T}@N%@a#Dv0c=UAukQP~{-a3|R`u@f4Vm
z#SoB7o_M2TAx4u@EJSZPXN{rqzEoM6yoi{vqvCxirQ||H*|AG%IszD(c_5;Jh<bLs
zEjDcXwBB@Gv;C{z^<A5H|Jb`X%jIITU2itQxs9rBnW&F3_7EM$aZJoSvU3?sFEsKF
z=m8?KuV>)Dkdcq?+$Nx^=T6^0Mcu}#>bQ=M@uigDy^m(v5K(K27HS>4Ff+9-#5liw
z^JM;qfB3=KFaM)oo^Q6p{NUhdc6fL+OGBCs{n#BG9JT<p<1jR;+Awo;&IN!%N~700
z+quGwh#U+os-!9$ysKE6D(QU2=};YM8$#_Kd52PDkK!;hWR)tH=$$daCL^0;wxY$@
z$b9t51Wh?9h-Dl_LuiV3P4R(B$(o&~Y=%UzQB+1%9f_!K+NNisz90H+((U%zJy$k=
z<8OTb_ItkPdp1pMwyLsG(Oyc~I`4Z^9n5TS>_#GF)L^UFi{11NT59JnTzW}EzM_$<
zp>ORkob5%m_gFB8sYD4N02a+O0@j$JHA6?l9kZKxZaPt!fAWz>X77Lh@6SH-nLnLN
z(V42vLTEY%*9G$3*pE#&n>8xZjN=$%j8U|NlEs6}Q~f{dS(_&0CV?(fB?HKD6==^n
zBY00$RL!cm=|ogx=TLHisu@+zQ&oei#19iK3W5c8Y79lC0tkU+wm2xcNXbb`&MCKD
zmrKc`cbotl4VYH2^{U#JQnp66ecQLcW&6YLeEatP`(M5F&TWs6kGJex53Aqjy|2yx
zYS`zcNqCv6*1xuqfz$l?jFDex=*id?%ru(W?rZ^SiMV5mopY{hyV>mc&YjtB{j>MY
ze)BhfYj*3_?b+RTUz?rWKJEg=ZZTiBeZOssl*aoI$9`xO5*ptGfdm4a)sk$@rvYwb
z<f55#N(6vHh)hHn(@1U8AmvPw3&>F&;|o-{u9%q-m|-9?CfX@+X~pW05>*^D)C2@!
z$C9&UVpp1`%fyySk)$Gt7$XRS6d9azJxKeLlav11wQJjV|Jb|w@BVAwxecw~Zu?Cy
zrSwG9Gjs2p8vu+`^Z#s`^si;$Z^+0yL)-H-hQFSnYnied+oom&H2}2)ZUNWjEM3#Y
zZZV(DKL7bI&i?VQ{*&&bANix%l`B`ea|egr<6nECJvusS0kqp~-y9q)n{D66;Cv9#
zNJL&t>zp<s2QmlE>>I}>pkeG;M9Dcv-aEkR><r0OjNP#ZQI&Tj_^RDkCGHJYX9!uv
zFDWt9Otpv<GZP{d$5n>4o6YiiwMs^mHmg;-aOvVGQU=F76e+`<+jn~M=-=`7AL`%r
zqwnl5UAnLx$G+e6tDXpb(=-DS4dXbDL^OKuM>E?Qcb5mBZ5@8Y2L6VP3;?(P-`dXY
zx31y}<Lfe)z0buYjvER35>O3<s*zCN0P%oS)T)0d>Yve4RS_x@5=u%-DjwXl!A^`F
z+vn^(vo3v@eT<z1S|Az8I&XgYX=cxw^{wwaeE6)66~QIg9ximRA^<kfj@cc%5K?F6
z-Fh|jv)Qbl&AZv3KmJSq(MNyi4-XG|Q|*YTpU;<>Ido^It6Wu5<d8%xg%E<OMI;Oe
z#O}_B!kmyy42Lq1i4g}zoI)*|do}_RA|ZjfL9ObH38o2TcZ7{QnmIJ{IwVj6RCR4a
zJ49h-2`QEJFjg}yi^Za->UeVcc<gc-YN<oaasBJJ-yVMZ``@kKdh@NdXdOiA+FjQO
zHgMp<-N#z%2mm897ew6b+zsF-zrU9NKUojI2*^)@-oW0pC>a0)B23K<Om2|OAlE9n
z>-ucwy@+;wmpcILSF5xBlfT~X{`B!5`!D}-uRA+ibur~`x!B63*2KtJ6;jS!RP}&_
zfq;UVa?Z@6g-a>q;1okd1f+2s0Ff}Jh=c@cif#sG4x;LWsX5OAwMjxS^U3zgT2Qkw
zk|2R1U?n19<~o+KGIQD4*(vw_`Q^A=E=L3yXS05|y1hMo_~CDc_uqeah$*d49-j;$
z#=+eNDdT_$BO;D%c#TVpv6xwP_l=DC`?^ZsSt>m@$o~)MR%RIkAh!okY?m@`un{?x
zQZfK!qL2Zg1AwldrB1DMUmrZ^Zr{G$-M;-vx4(bT)vEdQ<SftnMKXsp>*vu8BN9b$
zU{MVS#>mKSKx#@fsaU3X9n4(^OpK+L7P3tY2+cqM0G)`O7>$rx(k{AMYkesbDj<lt
zRd5$1tg2Q-N-?vNQXac5jk~+Q7~gyEz46wqTf=f|F^I@e$}j-HNW`P6js!3=(P(Cy
zom)2!4^zWo16Q8`_Xh+1(U6}3`{G+SwePl1xsT`hj{zKlxA?_`h!GL8J0?WRW|o00
z=Z?G8aMsP|^L%jdu>0a~f6se+d->B(Kg<8V{~#S69;KAJ_|n#u7($F9x(TBUAw*^-
z5)p1`DnQ(v;n2*mNqcou5<*JZ$8qgM;I)d+=W`Pgi!m5X!{6h$Rw9<!Y$mJKSv@{J
zs#Al$<{ZoQ>(|G3-hHRMzWe(4#+$qC3Da~`ZO1Txk7hQSS&1<fLMkS$i-d?W?cm8=
zjr2lC=~)AlKN#>&h79l&=*=%qdaw&ec>8mQ06y*P*3FuJF*#^fD0wXFJfAO8t<rT}
zp99Bq=g!@Hdb&z??tBsN-uWW!?d`=!4-bQyg{|dQK#Za9=7b1bYo%!hi^j2_h~R8C
zYbBLbAVdf;f~vS`bwu~|dhI(qJ9hZZp#iw%oOHE1Q)U)Kl>Pm$g_&e`cembr>t=o9
zjn~W7t5?e_ue@At+_+H)p_E#tHlR*7WG?_4v3t8QBS0l!Y0An=7po^9I4(9Eel%c!
z=KvYt*~j<v40=IIbUt4dz@MzGAp&4@@WcsHsbdNur1g5ps+P8vFQph`s#Q}d5|58h
z;?Xxp@xg=rc=zsI{_L~Q!{g&s_}AWjQdPck<qDe_iU?i1b`3>@X0sU%!vOR79EPEZ
z;>`_CPmi70O;vqsxwQR*eRDTkEEZF%u*z$%y(%Ak@PXXCc~h2Ki@I3M>-N>{3U1Zh
z3b>cmYE>M(rW6Z+7jv7+ATQI{N(BJHX1;tu{QkY)-g7uV7BIkbf(-C9=*?3%T)utd
z)R(5|_Wdnv$Kar`XpIh@Qiw68m`bU!mYQNp(ZthYYZ;hAtW_d22R9E#$0wX)2>*F-
zO!vOL$6tN*72UsopAH{Aq9O$kzJ7>f9q^mOBiz2W4UdnGfdfO=_dcvo{N<m&?ALdG
z=37@@vgKlKH(q_!wzigf>sP<j+;w7Ry0fz_Ib|73skIalsdXHO8bhdE-`7$~G1E!}
z(=;JgK$zx|T%Z}_D*!11D{RuR|HtkH_-TLvo+ISVx*$3Lc=}Ry{`L)<h?s9dbE~g0
zIC`vO2{EOZQjWFM=m61FBOnHFZ%>@WA#eyt$OM7=*^CL1-CMdlk&`>(!NDW!XC0oM
zoZ(nT0BBy^&9f4Gd;6Lbk*|lr0L&JPnW>tt&Q{vZvLc`!A0J7rRdSaE+$E<@+@YeI
zP@r1JQXQeG5F92SEf=5QI=Eu<9<V8b<c03ui|e^V2ADu^{w-d*lueL*k`Z01t;rn%
zQQ+8IPFQL=KhlXP#2CUjmf&t7rNoFBs?;`~gT#P9F+?UNlqzKIm{X(>A~u%+Mq&a}
z12+RC0z`IGcM&%t^iqn6G>gNSf}Wk8sEFudF;`-gQi>pvMvfw-3Lq#mi<?P|K>%FL
zRFO!V2=aVN)SB?OnLSUCp9K4pzP;bIUI^sPIyyX@GG{MA#wj-BqP&PE$gIT)kvOHy
z0LH31H6=nA$2I4i84<%c4lGhRgup2!Dzz}8lbMm3VhDj^j0gZEqM#}WfRIwcQVOUF
zFegWkpo&h^8t(wj>Ys^PBm=XCNfaO=N<@=8EvtzMP8QOtRYC~XtSD7EhUqxId|S4b
zh~e<9Khz7^y%*ODg$(fY@$DPs`qPgn2mll~QY}J(10w-V8ZSmdb~6S9HZ?Xk3QSDI
zq^cAm(|WxkW}>d^QB|pw(o#vig-lP={pT%6Q+G9hK*@>Nt5hRICvH>3RqB+<LFctA
zA~v^9B(*kOtcaxUYRtjhP2J3p&v&XJG#?N+PlU!7zI!jO{{jHHd>ZV-*JJ<y002ov
JPDHLkV1iUJ2V(#L

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/flags/burmese.png b/vasl_templates/webapp/static/images/flags/burmese.png
new file mode 100644
index 0000000000000000000000000000000000000000..93877b83898f4473c139c019bf8a3c8b1a703d83
GIT binary patch
literal 6382
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
bJmK0p3+sQtv$T9(>jM;IRHUn<OoIOhQQk7b

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/flags/chinese-gmd.png b/vasl_templates/webapp/static/images/flags/chinese~gmd.png
similarity index 100%
rename from vasl_templates/webapp/static/images/flags/chinese-gmd.png
rename to vasl_templates/webapp/static/images/flags/chinese~gmd.png
diff --git a/vasl_templates/webapp/static/images/flags/filipino.png b/vasl_templates/webapp/static/images/flags/filipino.png
new file mode 100644
index 0000000000000000000000000000000000000000..466e25a57c0a9bf8e66175295e938e2cd3f5b80a
GIT binary patch
literal 33433
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
Riwgh%002ovPDHLkV1gXj$?yOG

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/flags/indonesian.png b/vasl_templates/webapp/static/images/flags/indonesian.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9a6c456f19110157c3a316ed3b84c78c0090c02
GIT binary patch
literal 4264
zcmb8y^;;8c7YFcxOu9=Ylm_W-2uMl@6Yv3K<mm3$kd_dT1}Q;WDd`4j1U6}<Mr}xg
z!~_JSUwq!{{R7?~&V8=ybH4Za`M#sIpQ}-l-6I140F+R572TVz_qRxH-<+(@G(9(s
z)I;3}0RT|-{VjqtK`NFTBt}BDREbvzsBY0nEy+b^{!6Nc$S2-N2X`;Pr>bG~8=^qo
zkcutB+RM=c>FDkTpeN<vx^c3<uI%pN=jCYcfCN-f4?n(9s(;nX*79%k0n*Xc79ep#
zO?opS{X2Q#Zin=-^s)t*dR+gFlmENi5n=6Oc@y;lG<P>7-Z05uHn8+^b9A!@bhE6#
zxiRAZ-uL#hwgntrzux{|OxfMl)z%FOI37;#y0P1TV|tEA7h6E--Z&osK#hQ^Jkj&b
z-p!Ut<R0)u2h(OwolAw$s3?Xwd`sn0HV^64H1YxlF$4*Q6)V2$Wc6bp+RSg8U`q^;
zF-@a|aDoNPTm73hnhfA{Y_Yh^s!_F71<sYUS+2d&*L!MbC3ZhV<Jm)Sng36%E?%vf
z2c1<{e^roPl5%GTB2W+Y1jrvmeamYLSxK$aP7iAXYtc*dEwDAuQK@RH043G*YOI8Y
zG#hC2fQ&%NZh#uMO=TI0c7;WbC>lmnII6P&DoIruy{k0{5-olBzR7>Zo7D&HIj38a
zO-oA??YHpcL1f}fDs_J?XxMh93z+Z4`WEBjtNru~%%Z|Rb?}koDz}Y^FL*4<oxoI<
z>w^RE`*3D4!-LQ0I$3~PRD_Ax$|bnJPdh$uB8wE<>(s_gbLZY(!d*5)SOEjM*u(q}
z{s4YG+2w)N2Qlg<8m@TpYRHd=4xDr$O*&YpfHE<Tpy+FKJ#RYlDU##upQ{m*SLY+w
z$-!rPa>34|r%P<JOt^HybuA%4hRnDGgy{hxNS)b=Bh+fDBeI4hY}qa9VG)Ciz`oAZ
zb6QIg@KXRLSGs_SjgGd^sz#(^o85@MKdy*DS68vstKqmuH%`=B6D^=YYNqNTxxnH0
z%Uw&3t*#3N^BV-GvkuWu5SF-iavfgDow+U9mkdu#P;-0APQJFhdi+Ekrb;VoHV(KY
z*aR|{Ag8v|V*tnQHZ#z{)cISi`!k8)Wu1PZkMkTzJ_@VT{4Ny}2^;w*N`?>SQY(^i
z>2HN=6;WhOegjR8%wchIwEijPTQ4;mfe;Z&sc+fuo#-=(Xs;3L@TVM#ixn@o`hayK
zG7QVIa3d(?ZE!C2k?_=kE7fu4b6SG4P$jKt<7J|*GXCS=MxA7OZ5noeIt&Ii`wDPq
zR+}^|ukEQ129;zmFuh5o`;lR!n91Nty_@!@LfD6g7#fbJ*$jJ02Tq_r9}pv^<>KKH
zB}@<R2c8hYtlw*FnLGuli>=<S!WtWBThB|~qiFqsbAcns&QG{%bhWfhEhNGFpBeG7
z^g0V<IL(-IvK<TdBzO-QpyMvtyFD5fUr^_+b4it@q2OpXIT)49#-M4*l!5)ao(Wvr
zDWLtt@1{RuA?DbxLwOs^HmttXW*~-vRmi6ODX62p48>NC7CJOrnr4-07m^js>dD4`
z^)7(mDQP)~x?IDH2S;*tHG4)OMAf*U&^Bu-)o|5_WFp2MJr7!L9<PJ&7HuZHQ1uH~
zWxgs+(}yKXWrJ{~7{QNIHP#MOF8b=zs*~41N_)%~Msl=T^t8a*J$a)UE7QgW;>Mjz
zL36T<>I4ya5ecDrvNO8T@28b^J!O}S)DbVnqWJpKvY9d<DOwyr0B_S>Y%*qM#EONt
zNFBV;NdR>;12NHsRD~G_vv3h;i<3o0!2;mTfk?Z3#Ecgy3*3hCqw(fM!>1$hyz+bs
zG&I@C(4M)iSYYfpDE_wI^k<Jg`V`v=hHej9UOK+auOAXL?qIlSBTxR6QabDN@JtQ8
zd1QRlGO2BcCVv=4kL!pqjrulR?I*D*<uHT7N%AaEl-KfbZok@(Qf@ohma)Z>a)u>y
zo^57zkp0s*+DN&>b{`U4qpA+$_n?JG*ob8!o)anbXSnj39DL)h)Gdsp48r(Q=bQWx
zR0k)rWHv2&`_fe@%6xMx7@_^=8Gc1yO9QB;Djxl<C?@$W!`9;|n=J_?l5bnF>UCo^
zCaa<n6fDaNJ+v>;hM4d2KD2NO@7{*WQNxO)`9E^ocS2lJb?+??acR`=P6SLdO7cyB
zQv_E6cZy;?hwaF6SDKGLZ`dX-K%S>O6_Z1yixzSzV%e-~(!4cxna{8NUfYW5efs=!
z+Vo0lFlZa52C6F8f<OCg^8?u6uHZCw=Vv=|K`vhDvu%av^Sc))w6;EM5MH*@V&l{`
z10%=Kd@^`f6#`0_ILEKwm0<otkDq5JwNseBst<DUca6KOKX$6!Nk54dao#a`))V6`
z%*s4t7BIrfe9meek2<ziRfC<|@A_roNy0Z2Pm|)irtOHf=MHP}h{Cef!&8d0G7-0E
z<hjMS*a0r@pRVXl+d_7cqnG2EiJ%-;qL)PLr9ArNl4{+JwI~c?PUZlivch`lBMs*j
z79JJgY1cbSXUyOl7+}gI;g}<Ien0ojD(5tp5C0{XppYB^67nGOTy*c6=}@eio#ZNM
z7{EoEB1v0ZRw_)pJf7)-32R+HIbnQnsoyFHs*-zw>n{##WbiNX{#fr^FeMQ`Cwd@_
zOK1obZSY)hsPA{sbZvfZ?k5xql^+9d{if$7Ta&exusCL7slSrEjdO)t3(I4cWlZx5
zo2uC-)hwrkfE<I4bZb4rxt+5Ik)c3$&T>G2h5K}U*(M*u{OnoI%SLYN7v}SQYdyi`
z#42~(8|!#Aiz0K_^K72;#oTO9fjbSCzI|kNXT`Wik$<S}?R$w-pX8S%sAlJR8WjRc
zEq*gj>+hAfykb)siVV6r*)RoW#t~}?lkg6L6{=GB-e_lW(-12Qh#RitphHDC_m*N+
zfTLBV)hxAH10``7K-8YJPpGfnpV8iToT{I|GU%H#!qLbAUWKJqiv^R%7f`j3GpG$~
z-*0x9V!C+|thw~60TDjMkXQ1ZC&qG4+w`HjWgjO1frHT}47iny5T+U;JXn^%NUT)4
zbXlklyh(gpN^Gox&g^uqmzm5pNNY^EGT@r&uJ2@YsYIfkSN3feY{HZj^fH*Weikox
zbd}?SFD}c=<0xcR6SIr3N*Du9G)@|&`to=f)baMb`xy?SiLk=`1GGL620s^`s67lB
zTip<mah-7{)}_9c)lF0l<Uv2OG*%!^p2|d?QVSu$NX2tV{V9bFn=%oTphM${h>qnD
zxn{^z6p9h)>1+IzM-V)C3h@Lz>4!E|u%Gj5zx)8<9rSPakLPUch=zCfW~w6++@zva
zWPrd!!qfsfh|}3i5rl}MT%6UMaS$8VmoH4;8wT&%81#i30lyRFe&z18;LJ1cTAr8Y
z0PU+nHSN)mm2pD1EwgGyLs)7*BdRVtAW=E16(S>aRFAqdHDB&<VJ6D2PA1dXu)Dp@
zP&6wZZbgnwaP!)C)h`xE(2JQ@U2wL|((VIAo+-srd1bGbIx!DhiQU=|3Y~)NzroPs
zN0YAY{g!<|`&fbc!0P}r+aB+n7U1**WNPNSSe5`#ZzVF4(b`O@9A>igD1^~-oTmQS
z^=JPnr2^k*E_2s=4R(5EONHSrDmsCmHrBM{$Cd9hFA~OR3nipvT>|+#T_kE99WOB-
zBOd8Xcopak3jKObvKjVg*lHAS!&{Pfot<~JjQ?<U@tb&Ea-#p3e<;jHk-VR*?CyB@
zYIuytoO|U%3&zB4X*&i)Od3DPWJXo%Ss1^IftonsoF2@P2j$-|u5tP?9o1gxwrD;6
z*r1J;UdbKX>p<4?LI&Mstl*(Nl);PRy%n(<*7<mU@%r@sYS;Ce=qWn*%-%)%uul`(
zcvwT}g?+Ez99pJr>}JZm_$4MbCXTT^ccVGP1a&)rMecoEPF#NOP=MZVN%FKM<8S;g
z3dqN}n95D&oQOEFnx7`E?-=JRu-jtn`v-U|`87aEU-Yt}Y3{+7f(O@rOKo23*bDZN
z=nJCHR6F4YCc_W&J>LpC{v<#Md3@a<9&sDebsQ~n%Ik$_O%+dBs7_yH{Z9I>SwYZM
z9BsFl#rnRx4K!sLb9a~IA*2CK*U>@43<@6~$!<&0H6BsT3DB((YDXv+{j&3fkeWTn
z<F+JA=1Q9=gO-OY>b8+$c8pW8Nj1XQ*N~DI=l&*X=W|ulR12*<m5Nngk~kdLUSNyY
zM7E7i=RCAR(L_(m9yRy&)h5gnRMtB@GtGx?*ESV)?un_1CqP-9n!v@Xsr_-;!`&;(
zN@cmoxbIJuaeq8^4(uGG{37c6K|yU5tJ*7rN0)9jOK;!}CjE_LQmvLd!fnY7CoC*=
zSW>wLydk;H6T=*aWkW_^w_<1nk01|^S4v>s1}bU)p@fP8WEwq+SZSexv-T{`ocuhD
z#J7yLo*#6k`{s+FdoIa0=W4%}<bU*Z9}(Q^(Zzwp%M7wq+{`Y7)9@R)*w<7Wt)CCq
zKAI%RKm8eUoPh`4di79yPfPUms#=@^LkftZc~U+ZCH0%<eb7)#Kx^8fNwW;A^TE=B
zGK2WRhcbfFfWW1Ep`o6}w09F5g`b66x{8+29+hQ<srri5IT(1r%iU8mgnTg`fpor3
ze}#jrS0e6%!=sYWDX4vlSM$e@w2$rQMYrb97N0fmg^9;sS<IVkbRG<24HPv5R#Qcu
z3z^v%nTW~Gd=HQczr2G%wI5&T=O>(-%g4t|>;-8VAQ0>VMelpyPf-R>W+ite#Aa*i
z6y`h0kgeZeolxxjIE_cvwl$spIJ@|<<SCOVnr+l!6|}2)@kI1vRlx}fLY^4^%AMWJ
zrktRIFQ1w-d%Q8rQ6W-(Iv{vwLG3MC4%N}9g$tBhd$8jtfUOI8Cv?Db6sk}}?cuZT
z$J>m*klje#vm`@_%d57Z)><!E+sCK_<`SPPyb!$>XxcA%0E-t67CrY9>_Fx!5Zlj6
z{6;=L;#VkYVE-j~rZV^|`QEk}SM}W4n4%|QXmKP?Adi1VS_1>WwBY`=V2?gN1O+@U
z?rjf$)!ifx!;KP22B8Da?=N5TCbx8pCtw0~+;C7mT4-N?3e!6(YYK_mw4a(2x8({=
zO@CQkX+dj*y<~Z!HZbSzi-`tKgr!n&4M(B9iVJslVM)sCU$SUtr#G+PnIF*59$?Ia
zN8Xvg8ra5EpPpS%ayrs)#*!S$p7<{sYKBUcixweCi&AGMHvim9(>-g}d_UkAw|ma+
zdP)^TGC4#oy`fd`1?zY86SnYDpy<%fZZ%sJ#fm>jv@m_F+H3S^Y&fpE^Nj3t#Qh5U
z&ToBdO90Yv)srTlBo=rI^T#djJuXT;<Ei2rXzTqm5|3J_6Dll}uxX=m*ohnZFu?yS
zH+%9~g3(s+gLUNNS|N=~XK5XP*P(LHeQY_NS$vvLMPTiqTxl;Mu!`ero}k<n&2-Kd
e!RG&8iJSC>_7;)iQa2xR095t4N|lmD*na@sZW%iO

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/flags/polish.png b/vasl_templates/webapp/static/images/flags/polish.png
index 6133139fbe8396f8a776ed2c4e453c3efab6c13b..bd8756853ee3c63d4dad9d08fb4900972fc3a822 100644
GIT binary patch
delta 12396
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

literal 20842
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

diff --git a/vasl_templates/webapp/static/images/flags/slovakian.png b/vasl_templates/webapp/static/images/flags/slovakian.png
index 79b78c6d65f550593d89c369ccbdfb302b388ba8..6c8c9ebc861bd4e2f273186081d1c6ea2c5f2703 100644
GIT binary patch
delta 11643
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
FV1hnCXtDqR

literal 14143
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
S8ejK`0Wx3(iE1&UkpBm4@Fd~@

diff --git a/vasl_templates/webapp/static/images/flags/thai.png b/vasl_templates/webapp/static/images/flags/thai.png
new file mode 100644
index 0000000000000000000000000000000000000000..c25de6a0181a545ccdf87c8bceaaf3b94b6be147
GIT binary patch
literal 7284
zcmb7}S2!G8)TkwTH+r8jYLH+My$oa25H))5A{f0#4Wjo5qDIN+j2gWY1ku|lA$lk3
z$@ib<ocsS`?X{kFy?bA+XWy*o*XoMI1oQ+L7#PILN-(W|S?9mN!})hII+1n#OZcuz
z2JRRb%-#RRlXnxI(*Gc?hw>{0+>Ivy002VDV*&Udq@eEs_4KfJL12_sjw<~_L>~VT
z%*Ndc;o$1w;PMWG0-uHTA1C;a%e%PxA{^}OJur}@qvHQ4$^TG<jm3W|$iu<e21EFY
z6#rib|G$p5i>-&Z1;Pfy#P#t%o$!AicW}3QYw=G-U^I5tC;Y>B|KT?lh<6U}>@YeR
zet-DKaR2XpPlS~X#>HdU-v86&U7Ve5-g#hLj;43~V>th5Iu0IhZ7@m?Cpj@N7-W=T
zP#vG_gY1!bXVuDdnMHyA?B<zv%7`_goinWSKcJt5BktKE`9I{3=}Qzda3*Ap>0f8m
zeY+gawu-HO)dR2^8#OK_=VE6|%`ad2v_TCZ`EY;RXr*j>Ixk)M=W*}J-Q$cj_D$D;
zb{=r)e^qR*-XE;~mYL>kmzFSli}v+L>&NO7M_ViWS&UcA`zj<DUq}H6_<IwvA^KWZ
zNi?46lT+&Z_fZoG>PNV?@c6xv$^N5g5XSyud@0!>$n!^i%@IS!NSgENpwf&@7i*L&
zR#%oAqlB|bdB<UtY#rPiS627<u)Y|OtCsw#D99QM+-<!I!%{-1Ti@yE!mzv*b@4-U
znKb2RtLi)cCOqZ@-z)}qZv_W!kjo{v>AQ0A7SyxW%rsqO#YT|<<V8EoXOy0jr4}7Y
zfDPrz29Z#oqf$C+VmDJx76=)ZaL;IzYhJ&cxNY3QW$P|aN|a0KuU<z1a!uBIS(sx%
zQYW0l`nNF<c1eE}2D4cim3$n-GcIC#a5aN>{A3blhs>SAAC7w)f7xeL#cglPRKr0g
z%F1}S6y#7+JepWp52U$hXc8biEUKVzN&%CKlLDMQ3KM{k3aQ9rlM$uBljZZ)Ziz+M
zmo%IK$~Q^0?_KcZC_w#e%1VhkI!<cLA*BV}o)UHa`Qr6sM@IJcR>{T1@|aU8YEZ*_
zsSZ}@2QN;OB%+`Kis0Zx)sh2rk!chj$1mRU;wSQ~Lm0~4g;<aXh|Y6iB@am&QSoye
z^8D7>wXYmD_(?mR6R(pjeriNp*~*dw<o61&tOy~M873hxz|Uu_S}H8BLA!=(0xEH;
zyIn0_ht!e%BiF3s&9O8}$-Cv@ZWGP68zK(%qrJ-x8SuM>q_1R}ixTgnenQiS6`cu}
z9KLRI+r@7q413Q=#8J{oQN0e3!K|_$A-4F)X$CFI;(V?@0z!aV@6)BoGntTtpbKcV
zyy5m~{G(KxU%BRYijDI3Nr@p~8}U3ZOQIT%BDO}=f+y?ht%g>*VRi#*c=&2*LS0xw
zhlVMiyq`aXoxQ+N8JUi?7<W1~2*ay7z{=y0|Gp~3G`_tL<{zoC`H-T-BIsyYK3L!2
z*68ViZHQ``mKIc6ZwnNu)J&0bVaqqLmEUBnj7o&m3wB{IrB(>j(`5O~!*N^K51}Gm
z+wCd4k~)L0O`}-``Zb}wvYmAFyos8N&tReugL+hP=9*$K-|L@R9EV<f{Y4rsJc;>D
zscSGU3mJ?~A7kE}_`MghK(AvDI4O_#t<(Vj+ugg{0||WEm_E742_YIu%1Vu;_T>pr
z3r?kQGQ4O0Sy|Sj75bsP3@=dw(=oWTl!it=26}#N?}hQ8upwLaybsSa4mqcvcCnVs
zi(_-(Wv2eJ;A(*cP1CN*fu$O%z2L9AC7H;S{Zfg)zV(BHxbkE7v?n05?Qqua^`Uh_
zro#I};C-YSDo+Y%{G}aKuyhB)%90f2_$4qW$yqV&83p;E<>gu#1ar9B`V)OnOr?Sc
zB`&zdZ?;t9An%s2jm#v;{K}<rq$oC$j}|^LG;c6G4`Ljg7!2}&e5k-#%Gv6ziY!a}
zy-l{sN=~-3%tFYgQL=*>2*VoDqJ0A!awTH*gg#7lJhobUQ#-hdqJ-iDIlCQZd3=c0
zB!q-0kZnysToiJvx&TG<2QQ|+JG(rz9B>H3`Jo3x&xy?JQP6eO9A(lu#@%oEVtDYl
z#8^6`FAv7`jjC<>Zr$E(FI<L}A#N|mc{MaL>243;1jdzbASsJygc@cY6aJij1L?(~
zNr83-G}EaYC@a;%=Y)Z)Cxz~RPb2OxyAjP3SC|IKN*Sq|?`@#+UUow8At?B!=je2j
z8k`*D0qfM^fjGi_rXAHKalLOTqD$8ez8PHd_8SwPm*X7@9M|L;CV4lC<+>R<`5dLL
zi$KDTc>_LSUn<14(lIRh^JYhZzQV33!hyFW1)1D|_8tBMNEW60m4#zkIqNR4u0mw4
z5{Fd(H9XvdQSelC0o+8o<@c}*tfL55iLg5qs;OlKvr`JQZ8bP&dGQtEfL<>7#qN3c
zRF;=ud|l4QkU5MxzC(S;NMXnof;c#rVaFW>CWMOUJ$?3t3$rm^VAMod?x#aZ{-KoL
zqGa$iE4QEJHvTD)<_y2fKk?fnFO##1NWR^Bj!#S!`GV%jz121d$2mqF9}-1MA5mNJ
z-x>Pamf)o9@gZ4Q@p8IvWTht`|5UBB<BpKXAF6bM!T0v0Bl1n|9s|?E`S6R9mk~0d
zVS<}K1lc@~N^rkC{fw?EotCgIG-FZ$Qzb={p-z)=Emh8lAe2Qc@`<0eoS)l-XJXQ-
z<c6qmlnQkJ1aKe*oMJ#M_K1QfzXa~lOOy93zY}U2MzA(x^|9DSHdwLq&ZvZdbAp5^
z^eX)m!_ZW&m{O9Imjz9!{^scyxg-O70NxgzV}4g;cwP%RGgZKaY@gDam&ase_uc93
zV;UfGUL17_?G?~zfmTLg6$p|vyTmqnYWgOOn>HB!ot>o=D@^`7dcB4A7qs_T1}jc`
zv}2mL*|1^{a+QdGcYn6sg92uUkl=1>CMp{-NZdaBXs$~Zv2qj)Aj!%~z{e%?Va$vx
z^;YAG)^;+(S6C%XXv`5{Olu2b8zeAg=6s~38IvA8e7T37Z+#w*<}zEf<O;|ZuSOF1
zAQHj|HD<4qa}5Z2pJw@ZV6ksK{8FptQ0qrZ^Z4K~$Cpn?#-An=C4QDh+3RhFYFlhM
z<x_q>hs&dLIJyHzWL|3eH%ulNZ+>%u<0cO_cb!cmZ$noj?$*ARAMu7b;^l@AP4PdU
zW4sDb{=kP67}%>){_)o>8%*#MZqKW<8Z;EBag(39U?PvLqu1GwyYlw$QMg4?%D69Q
zyT~{P%Z*{)pwFWx(9zHDszoS!An*6#S=?1Wd{}H5lbEkJw0(h?>K#ISI!dzPs^RsS
zx<!1cGEBJ&Z-T!5@zN}KVCteIq%Sl`jS)wVFYkr>E>&~y@w+LpUvndSKX%^2)e_`r
zMU=RPj{<y&L~xw@?>}>^!}N57ZYWF_Z2&umHo(=aIKkR)Zr`qzbrR^P<`T?JaF~zc
zg)0V+Eb=*?<zjvtGhxvj(|w*8e8KnV`S81>BP5{UsM<8P$Hn-|3&ziwajuH5=H4;L
zJe;$3JT4#o{j>drUmN9I<>O^Ae`Q4HEtuO8Xl23&IzGMY-a>RCwWt<i4>e_5g$)JU
zByQX5D)+?ZQM?#$7xkW{phJ#C&)b<5SAA{}#X!X&*WOh@hH50?B8o+;_wuI%w~7({
z_-gKuTBXKpOm2J*N@$_rt^dV$XNjol7lbph2VU|G-G;{es)-D7*MPJy2K#oWI|^YJ
zgf$|Qm?>$ook)vXz(AU+U~g3uCwZDW9zFT2pWd5x>3gEojmbSt30bV-I$lC49KHqm
zkto@9@;S0fQi;j};|{!xk%+^wgRO{>3oWF+jJ<RIry3xGsuA8vUDe7hT`*sTh2|f+
zD{})LV}<aG4{}c{=)m3WK$xgmZf;Y3*vMA5$lv~!%5&2VGg14B{DSj)^Jc7>msy(>
z<QjK3POi;&N{rAc!XT``qb41#kH&+AZiHQ%BKwV!J=L*X3~za&>s(Zv;to(XNa8de
z9|ZyH<b|k04u;RJcrd(IG)qLa%f6*u(=w|V&d5u_nlxpDO~Q1Q{g6KFqXwl+006eL
zW*6ZKy)isr_To7Jj#uo(lpUWQ=o!sXQv==wlR)AYIgB$_Yh{3?(oZ54K#FLizM&Pj
zy!)HI{@D_c@t@XeXXw^swi**hX^mJE@0#ydvbHeQBw+Zz&)!L8oQ-$L_}B{0&Yq{X
zqe!OcyEG*b4HdkppjO66=nS+onVCWts}&fEEr}IfhsH?l`nmmpe_hv^tn?={@R~i9
zJC{ZJEFE|e^>NK`U*_47gnp&I*qSH&9J6jRMCJzrNLAL`6r1qX@438?ybt5Kb+)L9
zXcF5~U_rK-Oq)xE&TO)o>qews#5RC=<Cm*Bl=wxT6ayK4APY*-o?Q+!VxK%i2<Ymn
z%M7~|RM}f5sPlno^5nXPpLGl;W^nL)b$GvgI$!x10+Emsu~u+t&^c!Y-H+Cexr(%;
zu&MHVj-yBCcpB_{pqZJ3URoERd2w=w4#ezFb>}wW$j|}71Kgf7P+dyyd#dy)wqJj~
z+lw+RSvPGY3mHx5o*a@z3-1i5x9ao@fp_Sl9EuIWC+Gkjs_BnuEg0ktH(FxeY32@w
zUq7&kk(EhniHkp_aH>dMrZX-DX~h#U458G7lD|e9f<35T!NfV-3MlHJ1tkf~C=1mt
ziMs9y@osb?Q<wfhG_~TELxDWS#$3)z0aMCpfr<(`sX=M?C4?<y$~vaJ<@?yATPR*V
z<7@c*Yh|`B7#xD&*U9yM>rYOjd@W7x=es`5*eds9=liUGxrbi}g6^lb*3y1wJlZrC
zZT*NVol^>iA8RF6gV}{EeB)xBoZ>3KKV`rlOuE{&F*Iz-Yc}`l@`g@EzA=NEJMc7C
z#9&TBYb*x^g!0d;aDeE!1yFMPK|r%K`W^)NiPAgd?s7j)62of~OknMi{@qyw+KqbE
z_J**n9zuG^w19QkP|b<T0i<$>qZ;Nq$Cx=QL{~L+qeSG=WwQ#N70t>qH(OaoWHjJq
z+NzMUOWJ>vu5k@%n@9+K>Qlv*#TDc}O%GuDVJMISFvHyeF=9d4=NjX&0=@@q&5^tq
ziP$Rl@V*o!b245KM~GrnZ~#N%?sOeA3h2WjYsB^|jrn$#Gu#RSmAAY|+Nfa5nWr0}
z`jfq`yUqBYIkpXaS_wG(`0BuVNFB}K;w_5wAs-F={T9oX$vbMs&nW}(LlNy)mPYlZ
zB6Sf~M?D{BybhM#t_01r(H0eJU<GvFS=UspoCcVQO23FIsT$V@KT-2_-ZNGpR+J80
zgxIYr^`om}P4rK!?i6PUey94ryo6m+o+DlX3O9o9_98~y5(XZH?HnUg0Q%$&-wo?t
z9hK_bn7;Rxf^QkJj+Px_5O0}M2nSG4`j+fSC7t&A4Y&&!{j>9zr^64i4~3a7x<2Y%
zYc<Fk6xH}gcqHL7m-5$sXy{|T0VU!ZfNd<v$GUOo=!JW(sc}diwD9W`_NSSDV*gR_
zs5jn?cwt`;c(v^8AjZSuC7Z&biY*?tncHWTOw1(oi4qUA4!;^}sjPPnwy0rHZ6z}R
zNfl%i;t^OkK6w^-ATXs#uWiKHjjusJ1ddTT$@ydY$f-;-DKY;MU}*GhIQ7H?QXP_S
z+y3kcX%{lTqG;~6vy9u0;3>CA5Z?{`x%v6&vB0zT4{cLQnjhnZ5F}$E+@=#2{!=Nm
z@$S@Wn_&mS5hh+*M1m#7;$}f@>x!ODl{|DfI`{--KGeNK$fXfvz{gSuLkf3B5>hMY
zxB#OMOWx7x^BP;3q-cH@cqoTA9bb*kqlPjzi>6m4j8^nm^V%Kv_v;R}VG`7d^YhK5
zLOmYEgzPNw#^B{e)F=J`>yb@H?<BTR)riVP=R&D_SC%5HJ*pvY3AO|Qd~AA_z7JWu
z2I_)uO7wyzyvmDc1INn)$)Te$`by}$UFnZL!>wyYpaB8U>sOYP>egiQgvwEQuS&>s
zH!|gZHM42WKTDwPqX^qen?!|rXlHwe<T~4blOlFcNht=#?qBQ0E0x9Aa?h^rbZ1-)
zdwm<DF*>OX8!T2ah<v70!Yxyu*WJ#vC5t2q)({2P*!0b)Y`+5xBD&O)woJ|Nv*+Tm
z)C@8jYO@LlS@7~^TS<pxxDIQ*>PROe5Zpb?)Q<dWGZK{a;cD$vd9ji+Wx=Ud%oZ1H
zOLoxSXeY(v{F^ka+!t{(kBsLf@r;Drgub)`dZyB4$1m!VbvD<emK9SqQAFQr=?kl^
zuA`b2P5^j=N*lksKFz9&CO!Q=m#?Ou-u?N|K*D;iO$GbS3n|+nc5HOKCdTbBmfE84
zrBzy4K<d_-nawm73<e$0%rX#mL^wKH%ogCrl}pci7rK-E<#~myyRu8=36$Bv<=yj~
zmhmE2EF^F%X(X(ukRX=8%z*0&c``EnS_e&$AB7~`_Ce{5R=H2j%O($k$TX7%51LAh
zrXzm?nc@(Uw!=Xl)F%4r5g8dYkbKQmUm@HIx<lwD|C_9YW~l9HB{1TdzxaS&OpP&t
zjK<sjWx}wth2JF&;0@=(?~EOtRq=n)M*A0XuRR~N+40ZcBR$H10+aZ{i8F@9HoA$0
z1q=;v0+?5TM!XBIqZ|W~uXmNuBOcvsF<LR#NC!5LibK8N=XnFC&bx{iwyNo0NdOCS
zz^4gbHQuk?)UPl9`QYAM*)(9#Two=V?TL*C*$v;OO)p;4_1>O{sdU_?v^cF~htaT+
zj+)v(-kIGAR%TQs4xf#TO}?<gh_>gPbU=}t3}&h;#IPL(ie};yZB4(_wfbJat`hiF
zHZuJif-$Fr@6F`_SJ4E~k>==)v&<eO1)&8n*iYiVZ9hBTigsR{zY4382`H<sqPq<u
zn$i(_!H~TzRh1fMkOfW7UVON$bqj1s#9wT$d#FA|Eb6~dU;`?aH29|t#UiRkR93x%
z?z$3JAJJm7#VSZ17Lkp)(-j5hhVm?Jg*3}uPAHg^he~XxnO48yI7gy~Ll7^KK33Rb
zHQR>HXgFdfd4-Bjxt7-JMP!Q7Cp=a+8d-sj{VQHHnk72(N|?{4*+^52#i;h6t7WvP
z2=shD0W1^aPBpqor4|OOvma|<KOHa&8sgo*P5k!B!5TQK0cgxC;cs7DS@yx;#3loF
z4!;L!ce+OAaLz~stFKD54hhm-zoZGKnOVHry;7{}>q)6I+>%b094A|n2|D5f1`}-J
zRV{kmMwVN=j9Pf&hfB+#ot2W>!8`haWJNe6AbV+}U=Z`GB&Rf=B+2awB9~8ch2pQ%
z#<vXSp0P5UXz4qt_Kds)ht1{~(n4{<6u0SERIG|6lbyG1+$4{K>ukdjN?T93XVxU1
z-($i9@j|VA>dUOlvgf|k;lqReW|it0lt@sP_BUE$HNb4?tUV_U?^Bb!lNMFW6pBtT
z0ZaLplAiT(`^|=g_Bu(zQBOw7Tawg)$*wD~lt!%pQ*yT4+C@&s#LCs<wfFr?lCL?d
zEqv#D+sux)kL!)w_$iU*^*i#JsV5okPjyFdAeOeiqOV<P`sA-~b4ZR*uh+&V2PH<l
zrAwCHFeZWXJFL!DKAu!LZ8Jt;T)8@2-nOK;Wv@~4B7jqYj><74Ox`;5ugazs({{v~
zX-#5?9LV({Bz$UJvGn=RaBWTg4fE1TJ`vn;*Ey%00W*zTHVPST7Mnc8?GWoup~8J+
zrGPW8EMU&|;~bfvtSJ?^pc+|02t)}gmipT5-F6mCp~hNn>TGq1zSwe8P%w$rfT&sD
zd5TwUH8^sexh9(%5NYr&=AA{Evd=CB^3SOL!he;VW++;m)>O|Ozf9^uw;+0O)|+lH
zD#F}pK3qmX=9EU2>3etdr--D9RjZj>;Pu5qTk;NXQMD#?eaNqZJJYb~=3Q(!m_PYF
z_6c}^#k9YF7Gg-1t~aTrnCXO8l2f(6yb2!IrQg-5uLVlZe_u;uWnnZiI!R}q)7FjZ
z{i&)=3I7zh<pi$w-16~-B2Ng0Wal?rJxrp4vVV;((BFH>FNg|EN)%*xcgKE`rVCe0
z?vsl{^eTrJd0W#JZ+@Sud=nr8V){vUWye&FVR=j_t{!#G+cCBPP-r58EbM|JLAnd>
zi(<&14~MIFMsK}yyN@&C_A+?pDHCdjTYE&|<cB__3pVV2K(WloOda%loqeeUO_#=s
z%CdH_D`De>c-EvpK8#y^^_}jopQ9?iXTm0&$GeG6;cuv?V+Tz+c0vp$Z8xw~CuWLw
zluvabuLsa!$3X){u@t^x9Thz!A=V@X{oDwces1n@xE)|&{1M%8oDlr*e55h#qtMOc
zwRTb`*Q@Y3e+8w3pvtLxjZv#<I^BFd1;UiS%=s(&zy5TNakshIp2WUKj%D~=L8qKq
z&!;sRKvh`W{6c19v9ivq{s)isAI|t`WH-;Mzip)AdZS(AkKW0TGrJR1J68P$!$hBT
zH{SKvyfke$c91dAOLyKlMYtBrS1ozQYqMa%R--q%07Tt#z{a?-9-^xQQQ~WphTqdG
zbG?9|hEYq@*g#B}8Z+JLq^)M)#l2z|6=RSItv}72YbE5%XH@1J&=%#*`K~}gzv<TL
z6yPH_VYK4uH=%_ujWTY{cZ0J|tY-1zR9{s<y7hTvS!rwxVV_Rwr_AK(m3MoUh#{vx
zidH1{-dsV>eu@2{KgJVHoq|TBYWvKd5(nI<>+lOWx3^rj`_Sf%gExHlB=Rete#F&q
zsFt4^QQ;QtvW&@3TcwV|UHY3@OUrQGYOxZ%$SixZhbARE%fVl=y8ob>Z~`kPTfzIo
zg34t%uu8rC9`s=8PoX!KGM6xGr~6}{w10lK2)kY(RhQ@>gi-yo@XoefM0zx%3v2Ne
zW=@fU1DDz~t0SqI&fz1hZ&7LJ&;v9@-9h{?j1CxoJ4i$}2HN1mKM2ISSRNR6za#~u
zj=~mTl*1PCPcRqKO&@t9*m3dcik_L|FGi91+3<-S{0i$eRrbJfh3to};QH4pVIqTF
z5Pxk8hA?h?;TmGjW3Bq%>P3JWr$e#tSJqH(=tf%}q<h1M<l3n3kP+qBL;w=u$=F_d
zujYwYb6?<x{Ud+ELqDtaN~_Ni;|gJkha9y&PuHc8iKkdTgR7BB&ajFmC<{(JK?K{v
z=gxq@Ou4GF+yq^qm4D3Amml<n(vm_nTlt2_$^_rOLHf~}GRgg!({bIf<2?OmvaQFp
zm3NMEx8vih*C$y4&O9*Adr>FuobKUQ*Z?~{XBcoG%k#k>6ftBgW}zFRW7_^aE@;0B
zi-7eJR^lKboOdNXxG(CiFF*nrUB}V2>G+;K%==W;XwEM!{A#C1ei47U`?jpXGq+UA
z-qW*cBh}4_K5F8M<f~7pKK=`=7aDI&--*=E`#S#p@Y;|0?j&pQY78e3^>}+ZyVE{?
k89evD+D!d_`9UQ5JvIEQNJ-+~at%XSK^;~pXCC^006`7n?EnA(

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/images/spacer.png b/vasl_templates/webapp/static/images/spacer.png
new file mode 100644
index 0000000000000000000000000000000000000000..890b8f48d95924739d3e92e8d7ac68dcf2181128
GIT binary patch
literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4jBOuH;Rhv&5D9B#o
z>Fdh=n30`bk4<_;h9p?XHKN3^v?L?Hh+*ZrGaf)8o)VytOKNd)QD#9&W_})nFsGt2
zP@D@S?wnsxS(KTcQNpl>|BMw-ln*Rgl$r=qs!)=do62DNou3mZ!wHfJ&QB{TPb^Ah
zh%NXJQqB!FJhM1CClRQ$h++GIE&V`Y4v=toVo_dZUOK}8>1XXgF?NXl(xT*4hOhsd
zU&E9+=jZ08=9MsfJ2P!RP>c<vEF`leCzWBvyG!ao5nfLh#}JO0$v^)8w`XSH_`~$C
T_3UaBpag@btDnm{r-UW|ERSDV

literal 0
HcmV?d00001

diff --git a/vasl_templates/webapp/static/main.js b/vasl_templates/webapp/static/main.js
index 043beda..e3e85b6 100644
--- a/vasl_templates/webapp/static/main.js
+++ b/vasl_templates/webapp/static/main.js
@@ -186,21 +186,23 @@ $(document).ready( function () {
         restrict_droplist_height( $sel ) ;
     }
     function format_player_droplist_item( opt ) {
-        var url = gImagesBaseUrl + "/flags/" + opt.id + ".png" ;
+        if ( ! opt.id )
+            return opt.text ;
+        var url = make_player_flag_url( opt.id ) ;
         return $( "<div style='display:flex;align-items:center;'>" +
             "<img src='" + url + "' style='height:0.9em;margin-right:0.25em;'>" +
             " " + opt.text +
         "</div>" ) ;
     }
     init_select2( $( "select[name='PLAYER_1']" ),
-        "9em", false, format_player_droplist_item
+        "9.5em", false, format_player_droplist_item
     ).on( "select2:open", function() {
         on_player_droplist_open( $(this) ) ;
     } ).on( "change", function() {
         on_player_change_with_confirm( 1 ) ;
     } ) ;
     init_select2( $( "select[name='PLAYER_2']" ),
-        "9em", false, format_player_droplist_item
+        "9.5em", false, format_player_droplist_item
     ).on( "select2:open", function() {
         on_player_droplist_open( $(this) ) ;
     } ).on( "change", function() {
@@ -648,7 +650,7 @@ function update_ob_tab_header( player_no )
     // update the OB tab header for the specified player
     var player_nat = $( "select[name='PLAYER_" + player_no + "']" ).val() ;
     var display_name = get_nationality_display_name( player_nat ) ;
-    var image_url = gImagesBaseUrl + "/flags/" + player_nat + ".png" ;
+    var image_url = make_player_flag_url( player_nat ) ;
     var $elem = $( "#tabs .ui-tabs-nav a[href='#tabs-ob" + player_no + "']" ) ;
     $elem.html(
         "<img src='" + image_url + "'>&nbsp;" +
diff --git a/vasl_templates/webapp/static/snippets.js b/vasl_templates/webapp/static/snippets.js
index 683a581..4794d51 100644
--- a/vasl_templates/webapp/static/snippets.js
+++ b/vasl_templates/webapp/static/snippets.js
@@ -14,6 +14,20 @@ var _DAY_OF_MONTH_POSTFIXES = { // nb: we assume English :-/
     11: "th", 12: "th", 13: "th"
 } ;
 
+// NOTE: Blood & Jungle has a lot of multi-applicable notes that simply refer to other
+// multi-applicable notes e.g. "Fr C" = "French Multi-Applicable Note C".
+var BFP_MA_NOTE_REDIRECTS = {
+    "Br": "british",
+    "Ch": "chinese",
+    "Fr": "french",
+    "Ge": "german",
+    "Jp": "japanese",
+    "Ru": "russian",
+    "US": "american",
+    "AllM": "allied-minor",
+    "AxM": "axis-minor",
+} ;
+
 var gDefaultScenario = null ;
 var gLastSavedScenario = null ;
 var gLastSavedScenarioFilename = null ;
@@ -158,16 +172,42 @@ function make_snippet( $btn, params, extra_params, show_date_warnings )
         set_vo_note( "ordnance" ) ;
 
     // generate snippets for multi-applicable vehicle/ordnance notes
+    var pos ;
+    function redirect_ma_note( target, vo_type ) {
+        pos = target.indexOf( " " ) ;
+        var nat_redirect = BFP_MA_NOTE_REDIRECTS[ target.substring( 0, pos ) ] ;
+        if ( nat_redirect )
+            return get_ma_notes_for_nat( nat_redirect, vo_type )[ target.substring(pos+1 ) ] ;
+        return null ;
+    }
     function add_ma_notes( ma_notes, keys, param_name, nat, vo_type ) {
         if ( ! keys )
             return ;
         params[ param_name ] = [] ;
         for ( var i=0 ; i < keys.length ; ++i ) {
-            var ma_note = ma_notes[ keys[i] ] ;
+            var ma_note = null ;
+            if ( keys[i].substring( 0, 4 ) == "adf:" )
+                ma_note = redirect_ma_note( keys[i].substring(4), vo_type ) ;
+            else if ( keys[i].substring( 0, 6 ) == "cobra:" )
+                ma_note = redirect_ma_note( keys[i].substring(6), vo_type ) ;
+            else if ( keys[i].substring( 0, 4 ) == "pif:" )
+                ma_note = redirect_ma_note( keys[i].substring(4), vo_type ) ;
+            if ( ! ma_note )
+                ma_note = ma_notes[ keys[i] ] ;
+            var key = keys[i] ;
+            var extn_marker = "" ;
+            if ( nat === "italian" && vo_type === "ordnance" && keys[i] === "R" )
+                key = "<s>R</s>" ;
+            else {
+                pos = key.indexOf( ":" ) ;
+                if ( pos !== -1 ) {
+                    extn_marker = "&#x2756; " ;
+                    key = key.substring( pos+1 ) ;
+                }
+            }
             params[ param_name ].push(
-                "<span class='key'>" +
-                (nat === "italian" && vo_type === "ordnance" && keys[i] === "R" ? "<s>R</s>" : keys[i]) + ":" +
-                "</span> " +
+                extn_marker +
+                "<span class='key'>" + key + ":" + "</span> " +
                 (ma_note || "Unavailable.")
             ) ;
         }
@@ -304,6 +344,7 @@ function make_snippet( $btn, params, extra_params, show_date_warnings )
     // add in any extra parameters
     if ( extra_params )
         $.extend( true, params, extra_params ) ;
+    params.IMAGES_BASE_URL = APP_URL_BASE + gImagesBaseUrl ;
 
     // check that the players have different nationalities
     if ( params.PLAYER_1 === params.PLAYER_2 )
@@ -361,7 +402,12 @@ function get_vo_note_key( vo_entry )
         return null ;
     // nb: there are some note numbers of the form "1.2" :-/
     var match = vo_entry.note_number.match( new RegExp( "^([0-9.]+)" ) ) ;
-    return match ? match[1] : null ;
+    if ( ! match )
+        return null ;
+    var key = match[1] ;
+    if ( vo_entry.extn_id )
+        key = vo_entry.extn_id + ":" + key ;
+    return key ;
 }
 
 function is_known_vo_note_key( vo_type, nat, key )
@@ -389,6 +435,9 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
         new RegExp( "^([A-Z][a-z])$" ),
         new RegExp( "^([A-Za-z])<sup>" ),
         new RegExp( "^<s>([A-Za-z])</s>$" ),
+        // NOTE: There are BFP references like "Jp 5", but we ignore these since they are referring to
+        // a vehicle/ordnance *note*, not a multi-applicable note.
+        new RegExp( "^((Br|Ch|Fr|Ge|Jp|Ru|US|AllM|AxM) [A-Z]{1,2})(\\u2020(<sup>\\d</sup>)?)?$" ),
     ] ;
     var EXTRA_NOTES_INFO = {
         "alc/v": [ "allied-minor", "Allied Minor Common Vehicles" ],
@@ -404,6 +453,10 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
         if ( ! vo_entry.notes )
             continue ;
         for ( j=0 ; j < vo_entry.notes.length ; ++j ) {
+            if ( vo_entry.notes[j] === "US <s>P</s>" ) { // nb: can't do this with a regex
+                keys[0][ vo_entry.extn_id + ":US P" ] = true ;
+                continue ;
+            }
             var rc = false ;
             for ( k=0 ; k < regexes.length ; ++k ) {
                 var match = vo_entry.notes[j].match( regexes[k] ) ;
@@ -411,7 +464,14 @@ function get_ma_notes_keys( nat, vo_entries, vo_type )
                     var vo_id = vo_entry.id.split( ":", 1 )[0] ;
                     var is_extra = ["allied-minor","axis-minor","landing-craft"].indexOf( nat ) === -1 &&
                                    ["alc/v","alc/o","axc/v","axc/o","sh/v"].indexOf( vo_id ) !== -1 ;
-                    keys[ is_extra?1:0 ][ match[1] ] = true ;
+                    var key = match[1] ;
+                    if ( vo_entry.extn_id && !( vo_entry.extn_id === "adf" && nat === "american" && key.length === 1 ) ) {
+                        // NOTE: We include the extension ID as part of the key, except for BFP American vehicles,
+                        // whose multi-applicable notes refer to the main American multi-applicable notes,
+                        // not the BFP ones (there aren't any).
+                        key = vo_entry.extn_id + ":" + key ;
+                    }
+                    keys[ is_extra?1:0 ][ key ] = true ;
                     if ( is_extra ) {
                         // NOTE: Only the Americans/British and Japanese have landing craft, while Axis Minor Powers
                         // will never have Allied Minor common vehicles/ordnance (and vice versa), so if we have
@@ -552,6 +612,8 @@ function unload_snippet_params( unpack_scenario_date, template_id )
                 note_number: vo_entry.note_number,
                 notes: vo_entry.notes
             } ;
+            if ( vo_entry.extn_id )
+                obj.extn_id = vo_entry.extn_id ;
             if ( gUserSettings["include-vasl-images-in-snippets"] ) {
                 var url = get_vo_image_url( vo_entry, vo_image_id ) ;
                 if ( url )
@@ -589,6 +651,13 @@ function unload_snippet_params( unpack_scenario_date, template_id )
             ) ;
             if ( capabilities )
                 obj.raw_capabilities = capabilities ;
+            var comments = $(this).data( "sortable2-data" ).custom_comments ;
+            if ( comments ) {
+                obj.comments = comments ;
+                obj.custom_comments = comments.slice() ;
+            } else {
+                obj.comments = vo_entry.comments ;
+            }
             objs.push( obj ) ;
         } ) ;
         if ( objs.length > 0 )
@@ -652,7 +721,7 @@ function make_capabilities( raw, vo_entry, nat, scenario_theater, scenario_year,
                 capabilities[ capabilities.length-1 ] += " [" + caps.join(", ") + "]" ;
                 continue ;
             }
-            if ( $.inArray( key, ["HE","AP","A","D","C","H","B","s","sM","sD","sN","WP","IR","Towed"] ) === -1 ) {
+            if ( $.inArray( key, ["HE","AP","A","D","C","H","B","S","s","sM","sD","sN","WP","IR","Towed"] ) === -1 ) {
                 unexpected_caps.push( key ) ;
                 continue ;
             }
@@ -825,6 +894,13 @@ function _check_capability_timestamp( capabilities, timestamp, nat, scenario_the
     }
 
     // parse the month/year the capability becomes available
+    var match = timestamp.match( /^(\d+)-$/ ) ;
+    if ( match ) {
+        if ( scenario_year < 1900 + parseInt(match[1]) )
+            return capabilities[0] ;
+        else
+            return "" ;
+    }
     var month = MONTH_NAMES[ timestamp.substring(0,1) ] ;
     if ( month )
         timestamp = timestamp.substring( 1 ) ;
@@ -1127,7 +1203,7 @@ function do_load_scenario_data( params )
                         warnings.push( "Invalid V/O image ID for '" + params[key][i].name + "': " + params[key][i].image_id ) ;
                 }
                 if ( vo_entry )
-                    do_add_vo( vo_type, player_no, vo_entry, vo_image_id, params[key][i].custom_capabilities, params[key][i].seq_id ) ;
+                    do_add_vo( vo_type, player_no, vo_entry, vo_image_id, params[key][i].custom_capabilities, params[key][i].custom_comments, params[key][i].seq_id ) ;
                 else
                     unknown_vo.push( vo_id || "(not set)" ) ;
             }
@@ -1286,6 +1362,8 @@ function unload_params_for_save( user_requested )
                 entry.image_id = params[key][i].image_id ;
             if ( params[key][i].custom_capabilities )
                 entry.custom_capabilities = params[key][i].custom_capabilities ;
+            if ( params[key][i].custom_comments )
+                entry.custom_comments = params[key][i].custom_comments ;
             entries.push( entry ) ;
         }
         params[key] = entries ;
diff --git a/vasl_templates/webapp/static/sortable.js b/vasl_templates/webapp/static/sortable.js
index 29cf354..a0d83e9 100644
--- a/vasl_templates/webapp/static/sortable.js
+++ b/vasl_templates/webapp/static/sortable.js
@@ -6,6 +6,7 @@ SORTABLE_DISPLAY_NAMES = {
     ob_vehicles: [ "vehicle", "vehicles", "a" ],
     ob_ordnance: [ "ordnance", "ordnance", "an" ],
     vo_capabilities: [ "capability", "capabilities", "a" ],
+    vo_comments: [ "comment", "comments", "a" ],
 } ;
 
 SORTABLE_HINTS = {
diff --git a/vasl_templates/webapp/static/utils.js b/vasl_templates/webapp/static/utils.js
index 9d1d3ba..183db02 100644
--- a/vasl_templates/webapp/static/utils.js
+++ b/vasl_templates/webapp/static/utils.js
@@ -316,7 +316,7 @@ function add_flag_to_dialog_titlebar( $dlg, player_no )
     if ( ! player_nat )
         return ;
     var $titlebar = $dlg.dialog( "instance" ).uiDialogTitlebar ;
-    var url = gImagesBaseUrl + "/flags/" + player_nat + ".png" ;
+    var url = make_player_flag_url( player_nat ) ;
     $titlebar.find( ".ui-dialog-title" ).prepend(
         $( "<img src='" + url + "' class='flag'>" )
     ).css( { display: "flex", "align-items": "center" } ) ;
diff --git a/vasl_templates/webapp/static/vo.js b/vasl_templates/webapp/static/vo.js
index 29bab36..2657848 100644
--- a/vasl_templates/webapp/static/vo.js
+++ b/vasl_templates/webapp/static/vo.js
@@ -15,7 +15,7 @@ function add_vo( vo_type, player_no )
     var nat = $( "select[name='PLAYER_" + player_no + "']" ).val() ;
     var entries = gVehicleOrdnanceListings[vo_type][nat] ;
     if ( entries === undefined ) {
-        showErrorMsg( "There are no " + get_nationality_display_name(nat) + " " + vo_type + " listings." ) ;
+        showWarningMsg( "There are no " + get_nationality_display_name(nat) + " " + vo_type + " listings." ) ;
         return ;
     }
     var buf = [] ;
@@ -117,7 +117,7 @@ function add_vo( vo_type, player_no )
                     usedIds[ $(this).data( "sortable2-data" ).id ] = true ;
                 } ) ;
                 var seq_id = auto_assign_id( usedIds, "seq_id" ) ;
-                do_add_vo( vo_type, player_no, entries[sel_index], vo_image_id, null, seq_id ) ;
+                do_add_vo( vo_type, player_no, entries[sel_index], vo_image_id, null, null, seq_id ) ;
                 $(this).dialog( "close" ) ;
             },
             Cancel: function() { $(this).dialog( "close" ) ; },
@@ -127,7 +127,7 @@ function add_vo( vo_type, player_no )
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabilities, seq_id )
+function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabilities, custom_comments, seq_id )
 {
     // add the specified vehicle/ordnance
     // NOTE: We set a fixed height for the sortable2 entries (based on the CSS settings in tabs-ob.css),
@@ -149,6 +149,8 @@ function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabiliti
     } ;
     if ( custom_capabilities )
         data.custom_capabilities = custom_capabilities ;
+    if ( custom_comments )
+        data.custom_comments = custom_comments ;
     data.id = seq_id ;
     var buf = [ div_tag,
         "<img class='vasl-image'>",
@@ -177,7 +179,8 @@ function do_add_vo( vo_type, player_no, vo_entry, vo_image_id, custom_capabiliti
             "<img src='" + gImagesBaseUrl + "/snippet.png'",
             " class='snippet' data-id='" + template_id + "' title='" + GENERATE_SNIPPET_HINT + "'>"
         ) ;
-        data.vo_note_url = APP_URL_BASE + "/" + vo_type + "/" + vo_nat + "/note/" + vo_note_key ;
+        var url = APP_URL_BASE + "/" + vo_type + "/" + vo_nat + "/note/" ;
+        data.vo_note_url = url + vo_note_key ;
     }
     buf.push( "</div>" ) ;
     var $content = $( buf.join("") ) ;
diff --git a/vasl_templates/webapp/static/vo2.js b/vasl_templates/webapp/static/vo2.js
index 0e11d43..7aae2f9 100644
--- a/vasl_templates/webapp/static/vo2.js
+++ b/vasl_templates/webapp/static/vo2.js
@@ -15,13 +15,34 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
             show_warnings
         ) ;
     }
+    function get_default_comments( vo_entry ) {
+        return vo_entry.comments ? vo_entry.comments : [] ;
+    }
 
-    // get the vehicle/ordnance's capabilities
+    function load_entries( $sortable, entries ) {
+        $sortable.sortable2( "delete-all" ) ;
+        for ( var i=0 ; i < entries.length ; ++i )
+            add_entry( $sortable, entries[i], false ) ;
+    }
+    function unload_entries( $sortable ) {
+        var entries = [] ;
+        $sortable.find( "input[type='text']" ).each( function() {
+            var val = $(this).val().trim() ;
+            if ( val )
+                entries.push( val ) ;
+        } ) ;
+        return entries ;
+    }
+
+    // get the vehicle/ordnance's capabilities/comments
     var params = unload_snippet_params( true, null ) ;
     var vo_entry = $entry.data( "sortable2-data" ).vo_entry ;
     var capabilities = $entry.data( "sortable2-data" ).custom_capabilities ;
     if ( ! capabilities )
         capabilities = get_default_capabilities( vo_entry, params, true ).slice() ;
+    var comments = $entry.data( "sortable2-data" ).custom_comments ;
+    if ( ! comments )
+        comments = get_default_comments( vo_entry ) ;
 
     // load the dialog
     var vo_image_id = $entry.data( "sortable2-data" ).vo_image_id ;
@@ -50,7 +71,8 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
 
     // initialize
     var $capabilities = $( "#vo_capabilities-sortable" ) ;
-    function add_capability( val ) {
+    var $comments = $( "#vo_comments-sortable" ) ;
+    function add_entry( $sortable, val, visible ) {
         var $elem = $( "<div>" +
             "<img class='dragger' src='" + gImagesBaseUrl + "/dragger.png'>" +
             "<input type='text'>" +
@@ -59,42 +81,53 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
         $elem.children( "input[type='text']" ).val( val ).keydown( function(evt) {
             auto_dismiss_dialog( $dlg, evt, "OK" ) ;
         } ) ;
-        return $capabilities.sortable2( "add", {
+        var $entry = $sortable.sortable2( "add", {
             content: $elem,
-            data: { fixed_height: "1.4em" },
+            data: { fixed_height: "1.5em" },
         } ) ;
+        if ( visible ) {
+            $entry.find( "input[type='text']" ).focus() ;
+            $entry[0].scrollIntoView() ;
+        }
     }
 
-    // NOTE: on_reset_capabilities() gets bound when the sortable2 is *created*, so it needs some way
-    // to get the *current* vo_entry and params, otherwise it will use the values active when it was bound.
-    var $reset = $( "#vo_capabilities-reset" ) ;
-    $reset.data( { vo_entry: vo_entry, params: params } ) ;
+    // NOTE: on_reset_capabilities/comments() get bound when the sortable2 is *created*, so they need some way
+    // to get the *current* vo_entry and params, otherwise they will use the values active when they were bound.
+    var $reset_capabilities = $( "#vo_capabilities-reset" ) ;
+    $reset_capabilities.data( { vo_entry: vo_entry, params: params } ) ;
     function on_reset_capabilities() {
-        $capabilities.sortable2( "delete-all" ) ;
-        var capabilities = get_default_capabilities( $reset.data("vo_entry"), $reset.data("params"), false ) ;
-        for ( var i=0 ; i < capabilities.length ; ++i )
-            add_capability( capabilities[i] ) ;
+        load_entries( $capabilities,
+            get_default_capabilities( $reset_capabilities.data("vo_entry"), $reset_capabilities.data("params"), false )
+        ) ;
+    }
+    var $reset_comments = $( "#vo_comments-reset" ) ;
+    $reset_comments.data( { vo_entry: vo_entry, params: params } ) ;
+    function on_reset_comments() {
+        load_entries( $comments,
+            get_default_comments( $reset_comments.data("vo_entry") )
+        ) ;
     }
 
     // show the dialog
     var $dlg = $( "#edit-vo" ).dialog( {
         dialogClass: "edit-vo",
         title: "Edit "+vo_type,
-        minWidth: 350,
-        minHeight: 340,
+        minWidth: 550,
+        minHeight: 470,
         modal: true,
         create: function() {
             // initialize the dialog
             init_dialog( $(this), "OK", false ) ;
             $capabilities.sortable2( "init", {
-                add: function() {
-                    $elem = add_capability( "" ) ;
-                    $elem.find( "input[type='text']" ).focus() ;
-                    $elem[0].scrollIntoView() ;
-                },
+                add: function() { add_entry( $capabilities, "", true ) ; },
                 reset: on_reset_capabilities,
                 no_confirm_delete: true,
             } ) ;
+            $comments.sortable2( "init", {
+                add: function() { add_entry( $comments, "", true ) ; },
+                reset: on_reset_comments,
+                no_confirm_delete: true,
+            } ) ;
         },
         open: function() {
             // initialize
@@ -107,9 +140,8 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
                 border: "1px solid "+colors[2],
             } ) ;
             // load the dialog
-            $capabilities.sortable2( "delete-all" ) ;
-            for ( var i=0 ; i < capabilities.length ; ++i )
-                add_capability( capabilities[i] ) ;
+            load_entries( $capabilities, capabilities ) ;
+            load_entries( $comments, comments ) ;
         },
         buttons: {
             OK: function() {
@@ -119,18 +151,22 @@ function _do_edit_ob_vo( $entry, player_no, vo_type )
                 if ( vo_image_id )
                     $entry.data( "sortable2-data" ).vo_image_id = vo_image_id ;
                 // unload the capabilities
-                var capabilities = [] ;
-                $capabilities.find( "input[type='text']" ).each( function() {
-                    var val = $(this).val().trim() ;
-                    if ( val )
-                        capabilities.push( val ) ;
-                } ) ;
+                var capabilities = unload_entries( $capabilities ) ;
                 if ( capabilities.join() !== get_default_capabilities( vo_entry, params, false ).join() )
                     $entry.data( "sortable2-data" ).custom_capabilities = capabilities ;
                 else {
                     // the capabilities are the same as the default - no need to retain these custom settings
                     delete $entry.data( "sortable2-data" ).custom_capabilities ;
                 }
+                // unload the comments
+                var comments = unload_entries( $comments ) ;
+                if ( comments.join() !== get_default_comments( vo_entry ).join() ) {
+                    $entry.data( "sortable2-data" ).custom_comments = comments ;
+                }
+                else {
+                    // the comments are the same as the default - no need to retain these custom settings
+                    delete $entry.data( "sortable2-data" ).custom_comments ;
+                }
                 // update the original V/O entry to reflect the changes
                 update_vo_sortable2_entry( $entry ) ;
                 $(this).dialog( "close" ) ;
diff --git a/vasl_templates/webapp/templates/edit-vo-dialog.html b/vasl_templates/webapp/templates/edit-vo-dialog.html
index e2023f6..c1443c1 100644
--- a/vasl_templates/webapp/templates/edit-vo-dialog.html
+++ b/vasl_templates/webapp/templates/edit-vo-dialog.html
@@ -1,9 +1,8 @@
 <div id="edit-vo" style="display:none;">
 
-<div class="capabilities">
-
-    <div class="header"></div>
+<div class="header"></div>
 
+<div class="capabilities">
     <div class="fieldset-legend">Capabilities:</div>
     <div class="fieldset">
         <ul id="vo_capabilities-sortable" class="sortable"></ul>
@@ -14,7 +13,19 @@
             <button id="vo_capabilities-reset" class="sortable-reset"></button>
         </div>
     </div>
+</div>
 
+<div class="comments">
+    <div class="fieldset-legend">Comments:</div>
+    <div class="fieldset">
+        <ul id="vo_comments-sortable" class="sortable"></ul>
+        <div class="footer">
+            <button id="vo_comments-add" class="sortable-add"></button>
+            <img id="vo_comments-trash" class="sortable-trash">
+            <span class="spacer"></span>
+            <button id="vo_comments-reset" class="sortable-reset"></button>
+        </div>
+    </div>
 </div>
 
 </div>
diff --git a/vasl_templates/webapp/templates/vo-notes-report.html b/vasl_templates/webapp/templates/vo-notes-report.html
index a428bbc..ff1e8a3 100644
--- a/vasl_templates/webapp/templates/vo-notes-report.html
+++ b/vasl_templates/webapp/templates/vo-notes-report.html
@@ -68,6 +68,12 @@ $(document).ready( function () {
 
 function load_vo_notes( vo_notes, vo_entries )
 {
+    var $results = $("#results") ;
+    if ( !vo_notes && !vo_entries ) {
+        $results.html( "No results." ).show() ;
+        return ;
+    }
+
     // initialize
     var vo_type2 = (vo_type === "vehicles" ? "vehicle" : vo_type ) ;
     var header = nat[0].toUpperCase() + nat.substring(1) + " " + vo_type2[0].toUpperCase() + vo_type2.substring(1) + " Notes" ;
@@ -94,6 +100,26 @@ function load_vo_notes( vo_notes, vo_entries )
                 return +1 ;
             else if ( rhs === "multi-applicable" )
                 return -1 ;
+            // check if we have keys from an extension module (these always sort larger)
+            var lhsPos = lhs.indexOf( ":" ) ;
+            var rhsPos = rhs.indexOf( ":" ) ;
+            if ( lhsPos === -1 && rhsPos !== -1 )
+                return -1 ;
+            else if ( lhsPos !== -1 && rhsPos === -1 )
+                return +1 ;
+            else if ( lhsPos !== -1 && rhsPos !== -1 ) {
+                // both keys are from an extensions module, compare the extension ID's
+                var lhsExtnId = lhs.substring( 0, lhsPos ) ;
+                var rhsExtnId = rhs.substring( 0, rhsPos ) ;
+                if ( lhsExtnId < rhsExtnId )
+                    return -1 ;
+                else if (  lhsExtnId > rhsExtnId )
+                    return +1 ;
+                // both keys are from the same extension module, remove the extension ID and sort normally
+                lhs = lhs.substring( lhsPos+1 ) ;
+                rhs = rhs.substring( rhsPos+1 ) ;
+            }
+            // compare the two keys
             var lhs = parse_key( lhs ) ;
             var rhs = parse_key( rhs ) ;
             if ( lhs[0] < rhs[0] )
@@ -160,7 +186,6 @@ function load_vo_notes( vo_notes, vo_entries )
     }
     buf.push( "</table>" ) ;
 
-    var $results = $("#results") ;
     $results.html( buf.join("") ).show() ;
 }
 
diff --git a/vasl_templates/webapp/templates/vo-report.html b/vasl_templates/webapp/templates/vo-report.html
index c2d39f2..77af3d7 100644
--- a/vasl_templates/webapp/templates/vo-report.html
+++ b/vasl_templates/webapp/templates/vo-report.html
@@ -60,8 +60,7 @@ function load_vo_listings( objs )
     // load the vehicles/ordnance
     var buf = [] ;
     buf.push( "<table>" ) ;
-    buf.push( "<tr>", "<th>Name" ) ;
-    buf.push( "<th colspan='2'>Capabilities", "<th colspan='2'>Notes" ) ;
+    buf.push( "<tr>", "<th>Name", "<th colspan='2'>Capabilities", "<th colspan='2'>Notes", "<th>Comments" ) ;
     for ( var i=0 ; i < objs[nat].length ; ++i ) {
         var obj = objs[nat][i] ;
         if ( vo_name && obj.name.toLowerCase() != vo_name )
@@ -74,6 +73,7 @@ function load_vo_listings( objs )
         buf.push( "<td>", listval(capabilities) ) ;
         buf.push( "<td>", "<span class='val'>" + fmtval(obj.note_number) + "</span>" ) ;
         buf.push( "<td>", listval(obj.notes) ) ;
+        buf.push( "<td>", obj.comments ? listval(obj.comments) : "" ) ;
     }
     buf.push( "</table>" ) ;
     $results.html( buf.join("") ).show() ;
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
index 1d59af9..ec2f545 100644
--- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_ordnance.j2
@@ -2,4 +2,5 @@
 [*] {{ord.name}}: #={{ord.note_number}}{%if ord.notes%}
 - notes:{%for n in ord.notes%} "{{n}}"{%endfor%}{%endif%}{%if ord.capabilities%}
 - capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if ord.raw_capabilities%}
-- raw capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
+- raw capabilities:{%for c in ord.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if ord.comments%}
+- comments:{%for c in ord.comments%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
diff --git a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2 b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
index cf4be8b..20f035b 100644
--- a/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
+++ b/vasl_templates/webapp/tests/fixtures/data/default-template-pack/ob_vehicles.j2
@@ -2,4 +2,5 @@
 [*] {{veh.name}}: #={{veh.note_number}}{%if veh.notes%}
 - notes:{%for n in veh.notes%} "{{n}}"{%endfor%}{%endif%}{%if veh.capabilities%}
 - capabilities:{%for c in veh.capabilities%} "{{c}}"{%endfor%}{%endif%}{%if veh.raw_capabilities%}
-- raw capabilities:{%for c in veh.raw_capabilities%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
+- raw capabilities:{%for c in veh.raw_capabilities%} "{{c}}"{%endfor%}{%endif%}{%if veh.comments%}
+- comments:{%for c in veh.comments%} "{{c}}"{%endfor%}{%endif%}{%endfor%}
diff --git a/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json b/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
index 8e1fa06..0e81d8f 100644
--- a/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
+++ b/vasl_templates/webapp/tests/fixtures/data/vehicles/german.json
@@ -22,6 +22,10 @@
   "notes": [ "A", "C" ],
   "id": "ge/v:992"
 },
+{ "name": "a commented german vehicle",
+  "comments": [ "a comment", "another comment" ],
+  "id": "ge/v:993"
+},
 { "name": "name only",
   "id": "ge/v:999"
 }
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
index 339d6d7..c904850 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/landing-craft.txt
@@ -1,7 +1,7 @@
 === landing craft ===
 
-Name      Capabilities    (effective)    #    Notes
---------  --------------  -------------  ---  ------------------------------------------------
+Name      Capabilities    (effective)    #    Notes                                             Comments
+--------  --------------  -------------  ---  ------------------------------------------------  ----------
 LCP(L)    DP 2 CS 4       DP 2 CS 4      1†   A†<sup>1</sup> B†<sup>3</sup> C†<sup>2</sup> D
 LCA       DP 3 CS 6       DP 3 CS 6      2†   n/a
 LCVP      DP 3 CS 5       DP 3 CS 5      3†   B†<sup>2</sup> C†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
index 8b8a884..3da9e09 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1940.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1940 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
index c5d1157..04dee0c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1941.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1941 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
index 51d3989..047c694 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1942.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1942 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
index b54ce8f..b16b671 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1943.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1943 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
index c41ebe0..542dc27 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1944.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1944 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
index a0c3de6..e1ef5cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/allied-minor-common/1945.txt
@@ -1,18 +1,18 @@
 === ordnance/allied-minor-common/1945 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  -----------------------
+Name                             Capabilities                   (effective)                    #    Notes                    Comments
+-------------------------------  -----------------------------  -----------------------------  ---  -----------------------  ----------------------
 Brandt Medium Mortar             NT QSU s8                      NT QSU s8                      23†  A B Gr N P Y
 37mm Bofors AT                   NT QSU                         NT QSU                         24†  A De P
 3.7cm PaK 35/36                  NT QSU                         NT QSU                         25†  Gr Ne Y
 Bohler M35 47mm                  NT QSU                         NT QSU                         26†  A Gr Ne Y
-65mm wz.06                       NT QSU no Gunshield h-d        NT QSU no Gunshield h-d        27†  A Gr P Y
+65mm wz.06                       NT QSU h-d                     NT QSU h-d                     27†  A Gr P Y                 No Gunshield.
 75mm wz.97                       NT QSU s8                      NT QSU s8                      28†  A Gr N P
 Bofors M34                       NT QSU                         NT QSU                         29†  A B Gr Ne N
 75M 19S                          NT QSU h-d AP5 s6              NT QSU h-d AP5 s6              30†  A Gr P Y
 C105 L 13 S                      NT                             NT                             31†  B P Y
 120mm wz. 09/31                  NT h-d s6                      NT h-d s6                      32†  N P
 155mm 17 S                       NT s8                          NT s8                          33   B Gr P Y
-Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR† Towing NA†[1]       T 2 TK DR† Towing NA†[1]       34†  T†<sup>1</sup> B Gr Y
+Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     34†  T†<sup>1</sup> B Gr Y    Towing NA†<sup>1</sup>
 20mm Oerlikon                    T LF [NT, 20†[1], 2 ROF, B11]  T LF [NT, 20†[1], 2 ROF, B11]  35†  C†<sup>1</sup> Gr Ne Y
 40mm Bofors AA                   T LF [40†[1], 2 ROF]           T LF [40†[1], 2 ROF]           36†  C†<sup>1</sup> B N Ne P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
index 4f8d44c..87fbea2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1940 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
index 82efcd9..1385d55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1941 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
index 36ea0f9..72e00d3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1942 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8                              17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
index c4c21e5..bdc6c23 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1943 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
index 4b82b2b..be1c26b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1944 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR 5PP OBA†                         1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR 4PP                              2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8           20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8                 20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
index 6a3eee3..06705be 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/american/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/american/1945 ===
 
-Name                              Capabilities                        (effective)                         #       Notes
---------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------
+Name                              Capabilities                        (effective)                         #       Notes                            Comments
+--------------------------------  ----------------------------------  ----------------------------------  ------  -------------------------------  ----------------------------
 M2 60mm Mortar                    IR WP7[5] 5PP OBA†                  IR WP7 5PP OBA†                     1†      F N
 M19 60mm Mortar                   IR WP6[5] 4PP                       IR WP6 4PP                          2       F
 M1 81mm Mortar                    NT QSU WP8                          NT QSU WP8                          3       F N
@@ -20,12 +20,13 @@ M3 105mm Howitzer                 NT C7[P]†[1] H7 WP8 s7              NT H7 WP
 M1 4.5-in. Gun                    NT                                  NT                                  16†     <s>P</s>
 M1918 155mm Howitzer              NT WP8 s7[3+]                       NT WP8 s7                           17†     N
 M1 155mm Howitzer                 NT WP8 s7                           NT WP8 s7                           18†     N
-M1918M1 155mm Gun                 NT RFNM AP4†[1] no IF WP8           NT RFNM AP4†[1] no IF WP8           19†     A†<sup>1</sup> N
-M1A1 155mm Gun                    NT RFNM AP4†[1] no IF WP8 s7[5]     NT RFNM AP4†[1] no IF WP8 s7        20†     A†<sup>1</sup>
-M1 8-in. Howitzer                 NT RFNM no IF                       NT RFNM no IF                       21†     n/a
+M1918M1 155mm Gun                 NT RFNM AP4†[1] WP8                 NT RFNM AP4†[1] WP8                 19†     A†<sup>1</sup> N                 No IF.
+M1A1 155mm Gun                    NT RFNM AP4†[1] WP8 s7[5]           NT RFNM AP4†[1] WP8 s7              20†     A†<sup>1</sup>                   No IF.
+M1 8-in. Howitzer                 NT RFNM                             NT RFNM                             21†     n/a                              No IF.
 M51 Multiple .50-cal MG Carriage  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  T LF [2 ROF, 20 IFE, B11] 4 TK DR†  22†     n/a
 M1A2 37mm AA Gun                  T                                   T                                   23†     N
 M1 40mm AA Gun                    T LF [40†[1], 2 ROF]                T LF [40†[1], 2 ROF]                24†     B†<sup>1</sup>
 M3 3-in. AA Gun                   T NM                                T NM                                25      P
 M1A1 90mm AA Gun                  T NM                                T NM                                26†     N
 M2 90mm AA Gun                    T LF [90†, 1 ROF, B11]              T LF [90†, 1 ROF, B11]              27†[1]  B†
+20mm Oerlikon Mk4                 T 2 TK DR's†                        T 2 TK DR's†                        1†      US P                             Multiple Hits (C3.8) are NA.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
index 005ccff..1b65923 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1940 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
index 98972fd..6eab7b1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1941 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
index 1c63530..0ec4200 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1942 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU                         53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU s6                      54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU                         55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
index 86fdb1e..3089441 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1943 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A4                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A4                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
index 5307a6a..70d0571 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1944 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A3                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A3                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
index 00a5119..6271360 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/axis-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/axis-minor-common/1945 ===
 
-Name                             Capabilities                   (effective)                    #    Notes
--------------------------------  -----------------------------  -----------------------------  ---  ----------------------
+Name                             Capabilities                   (effective)                    #    Notes                   Comments
+-------------------------------  -----------------------------  -----------------------------  ---  ----------------------  -------------
 5cm leGrW 36                     5PP                            5PP                            44   A H S C B
 50mm RM obr. 40                  4PP                            4PP                            45   A R H S C
 8cm GrW 34                       NT QSU IR s7                   NT QSU IR s7                   46†  A C B
@@ -10,7 +10,7 @@ PM obr. 38                       NT QSU h-d s8                  NT QSU h-d s8
 Ur wz. 35                        1PP                            1PP                            49   R H S C B
 s18-1100                         5PP                            5PP                            50   A R H
 Kanon PUV vz. 37(t)              NT QSU A4[1S]                  NT QSU                         51†  E H S B
-Bohler M35                       NT QSU no Gunshield            NT QSU no Gunshield            52†  A R H S
+Bohler M35                       NT QSU                         NT QSU                         52†  A R H S                 No Gunshield.
 5cm PaK 38(g)                    NT QSU A4[3]3[4]               NT QSU A3                      53†  E R H S B
 7.5cm PaK 97/38(g)               NT QSU H5[3+] s6               NT QSU H5 s6                   54†  E R B
 7.5cm PaK 40(g)                  NT QSU A4[3]3[4]               NT QSU A3                      55†  E R H S B
@@ -25,7 +25,7 @@ Skoda M35                        NT AP7 C7[CS]†                 NT AP7
 G obr. 10/30                     NT h-d s7                      NT h-d s7                      64†  R B
 G obr. 38                        NT s5[1-2R]†                   NT                             65   R B
 Skoda M14                        NT                             NT                             66†  R H S
-Skoda M15/16                     NT no IF s6                    NT no IF s6                    67†  S C
+Skoda M15/16                     NT s6                          NT s6                          67†  S C                     No IF.
 C mle 17 S                       NT s7                          NT s7                          68†  R B
 Mitrailleuse de 13.2 CAJ mle 30  T 2 TK DR†                     T 2 TK DR†                     69†  T†<sup>1</sup> R B
 Oerlikon FF                      T LF [NT, 20†, 2 ROF, B11]     T LF [NT, 20†, 2 ROF, B11]     70   G† R H S C B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
index 917a835..f103077 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1940 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
index db96264..8676a18 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1941 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
index 871297c..d060ccc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1942 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
index 28d4e54..3f2df78 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1943 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
index c44e3a5..be73b13 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1944 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
index 87e7eb1..0196874 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/belgian/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/belgian/1945 ===
 
-Name          Capabilities         (effective)          #    Notes
-------------  -------------------  -------------------  ---  -------
-DBT           3PP †                3PP †                6†   A B D
+Name          Capabilities         (effective)          #    Notes    Comments
+------------  -------------------  -------------------  ---  -------  ----------
+DBT           3PP                  3PP                  6†   A B D    †
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
 M76 A         NT h-d LF† [INF]     NT h-d LF† [INF]     7†   A B D
-7.6cm FRC     NT QSU †             NT QSU †             8†   A B
+7.6cm FRC     NT QSU               NT QSU               8†   A B      †
 C47 FRC M 32  NT QSU               NT QSU               9    B
 C75 TR        NT QSU h-d s5        NT QSU h-d s5        10   B
 C75 GP        NT LF [75*, B10] s5  NT LF [75*, B10] s5  11   B
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 8d0a159..0ae60a3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1940 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP s7                         1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU WP7                     2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
index a26223a..6e20f41 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1941 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP s7                         1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU WP7 s8†                 2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
index 8f6cd56..1ae5eec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1942 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
index 192b1b9..1ca385f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1943 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU                         6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
index b9da5e9..aedfc37 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1944 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU HE8†                    6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
index 4ba2314..6229ea0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/british/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/british/1945 ===
 
-Name                         Capabilities                       (effective)                    #    Notes
----------------------------  ---------------------------------  -----------------------------  ---  --------------------
+Name                         Capabilities                       (effective)                    #    Notes                 Comments
+---------------------------  ---------------------------------  -----------------------------  ---  --------------------  ---------------
 OML 2-in. Mortar             4PP IR[2+]† s7                     4PP IR† s7                     1    A† N P
 OML 2-in. Airborne Mortar    IR s7 3PP                          IR s7 3PP                      1    n/a
 OML 3-in. Mortar             NT QSU IR[2+]†[1] WP7 s8[1+]†      NT QSU IR†[1] WP7 s8†          2†   A†<sup>1</sup> D N P
-OSB 4.2-in. Mortar           NT WP7 s8 Towed†                   NT WP7 s8 Towed†               3†   N P
+OSB 4.2-in. Mortar           NT WP7 s8                          NT WP7 s8                      3†   N P                   Towed†
 OQF 25mm Hotchkiss           NT QSU                             NT QSU                         4†   B N
 OQF 2-Pounder                T LF [NT, 40†[1], 2 ROF, B11]      T LF [NT, 40†[1], 2 ROF, B11]  5†   B C†<sup>1</sup> N P
 OQF 6-Pounder 7-cwt          NT QSU D6[J4E]7[5]† HE7[F3]8[4+]†  NT QSU D7† HE8†                6†   B N P
@@ -21,8 +21,8 @@ OQF 4.5-in. Howitzer         NT WP7 s8                          NT WP7 s8
 OBL 4.5-in. Gun              NT                                 NT                             16†  N
 OBL 5.5-in. Gun-Howitzer     NT                                 NT                             16†  N P
 OBL 6-in. Howitzer           NT                                 NT                             17†  N P
-OBL 7.2-in. Howitzer Mk I    NT no IF Acq. NA†                  NT no IF Acq. NA†              18†  N P
-OBL 7.2-in. Howitzer Mk VI   NT RFNM no IF                      NT RFNM no IF                  19†  P
+OBL 7.2-in. Howitzer Mk I    NT                                 NT                             18†  N P                   No IF. Acq. NA†
+OBL 7.2-in. Howitzer Mk VI   NT RFNM                            NT RFNM                        19†  P                     No IF.
 OQF 20mm AA                  T                                  T                              20   n/a
 OQF 40mm AA                  T LF [40†[1], 2 ROF]               T LF [40†[1], 2 ROF]           21†  C†<sup>1</sup> N P
 OQF 3-in. 20-cwt AA          T                                  T                              22†  E P
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
index 7d643ce..80cc592 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1940.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1940 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
index 1465bcc..2c39160 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1941.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1941 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
index f8f9af2..fba6cb6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1942.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1942 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
index a6ed35d..d9908b0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1943.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1943 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
index cbf0700..dc536c7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1944.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1944 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
index c001d30..5e4705c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/bulgarian/1945.txt
@@ -1,12 +1,12 @@
 === ordnance/bulgarian/1945 ===
 
-Name                Capabilities                     (effective)                      #    Notes
-------------------  -------------------------------  -------------------------------  ---  --------------
-LG de 50 mle 37     2PP                              2PP                              37   A
-Madsen M-35         NT QSU no Gunshield R2 IFE=B10†  NT QSU no Gunshield R2 IFE=B10†  38†  T†<sup>1</sup>
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Skoda Infantry Gun  NT QSU h-d                       NT QSU h-d                       39†  n/a
-Bofors 75mm M36     NT QSU h-d                       NT QSU h-d                       40†  A
-75mm K-S            NT QSU h-d s5                    NT QSU h-d s5                    41†  n/a
-Ob 105mm GP         NT LF [105*†[1]] s5              NT LF [105*†[1]] s5              42†  G†<sup>1</sup>
-D/30 Krupp          NT RFNM no IF                    NT RFNM no IF                    43   n/a
+Name                Capabilities         (effective)          #    Notes           Comments
+------------------  -------------------  -------------------  ---  --------------  -------------
+LG de 50 mle 37     2PP                  2PP                  37   A
+Madsen M-35         NT QSU R2 IFE=B10†   NT QSU R2 IFE=B10†   38†  T†<sup>1</sup>  No Gunshield.
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Skoda Infantry Gun  NT QSU h-d           NT QSU h-d           39†  n/a
+Bofors 75mm M36     NT QSU h-d           NT QSU h-d           40†  A
+75mm K-S            NT QSU h-d s5        NT QSU h-d s5        41†  n/a
+Ob 105mm GP         NT LF [105*†[1]] s5  NT LF [105*†[1]] s5  42†  G†<sup>1</sup>
+D/30 Krupp          NT RFNM              NT RFNM              43   n/a             No IF.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
index 75bf68f..6decc6d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1940.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1940 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
index ddd13ce..7720b74 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1941.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1941 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
index 6a82512..0ea092a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1942.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1942 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
index 9739e06..1340fcd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1943.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1943 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
index 8f39d39..9b7378f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1944.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1944 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
index 8463378..ff8d7f5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese/1945.txt
@@ -1,8 +1,8 @@
 === ordnance/chinese/1945 ===
 
-Name                            Capabilities                    (effective)                     #       Notes
-------------------------------  ------------------------------  ------------------------------  ------  --------------------------
-Type 27 Grenade Launcher        2PP Air Bursts NA†              2PP Air Bursts NA†              1†      A
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
 Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
 5cm leGrW 36                    5PP                             5PP                             2       A
 50mm RM obr. 38                 5PP                             5PP                             2       A
@@ -15,8 +15,8 @@ M1 81mm                         NT QSU WP7                      NT QSU WP7
 M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
 3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
 M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
-37mm PP obr. 15R                NT QSU h-d Low Ammo†            NT QSU h-d Low Ammo†            7†      <s>B</s>
-Cannone da 70/15                NT QSU Acq. NA† Low Ammo† h-d   NT QSU Acq. NA† Low Ammo† h-d   7†      A <s>B</s>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
 7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
 Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
 7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
new file mode 100644
index 0000000..7095aa6
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1940.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1940 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
new file mode 100644
index 0000000..8e34018
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1941.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1941 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
new file mode 100644
index 0000000..2aef635
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1942.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1942 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
new file mode 100644
index 0000000..5c70d0f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1943.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1943 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
new file mode 100644
index 0000000..375da5c
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1944.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1944 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
new file mode 100644
index 0000000..694a031
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/chinese~gmd/1945.txt
@@ -0,0 +1,40 @@
+=== ordnance/chinese~gmd/1945 ===
+
+Name                            Capabilities                    (effective)                     #       Notes                       Comments
+------------------------------  ------------------------------  ------------------------------  ------  --------------------------  ------------------
+Type 27 Grenade Launcher        2PP                             2PP                             1†      A                           Air Bursts NA†
+Mortaio da 45 "Brixia"          4PP                             4PP                             2       A D†
+5cm leGrW 36                    5PP                             5PP                             2       A
+50mm RM obr. 38                 5PP                             5PP                             2       A
+Type 89 Heavy Grenade Launcher  IR WP5 s5 4PP                   IR WP5 s5 4PP                   2†      A
+M2 60mm                         IR 5PP OBA†                     IR 5PP OBA†                     3†      A
+Stokes 3-in.                    NT QSU                          NT QSU                          4       A E†
+8cm GrW 34                      NT QSU IR s6                    NT QSU IR s6                    4       A E†
+82mm BM obr. 37                 NT QSU IR s6                    NT QSU IR s6                    4       A E†
+M1 81mm                         NT QSU WP7                      NT QSU WP7                      5       A B
+M2 4.2-in.                      NT QSU WP9                      NT QSU WP9                      5†      B
+3.7cm PaK 35/36                 NT QSU                          NT QSU                          6       E†
+M3A1 37mm                       NT QSU C7†[1]                   NT QSU C7†[1]                   6†      C†<sup>1</sup>
+37mm PP obr. 15R                NT QSU h-d                      NT QSU h-d                      7†      <s>B</s>                    Low Ammo†
+Cannone da 70/15                NT QSU h-d                      NT QSU h-d                      7†      A <s>B</s>                  Acq. NA† Low Ammo†
+7.5cm Krupp M08                 NT QSU h-d AP5 s5               NT QSU h-d AP5 s5               8       A F†
+Obice da 75/13                  NT QSU h-d                      NT QSU h-d                      8       A D† F†<sup>1</sup>
+7.5cm leIG 18                   NT QSU h-d                      NT QSU h-d                      9†      n/a
+76.2mm PP obr. 27               NT QSU AP6 s6                   NT QSU AP6 s6                   9†[1]   D†
+M1A1 75mm Pack Howitzer         NT QSU h-d C5†[1] WP7           NT QSU h-d C5†[1] WP7           10†     A C†<sup>1</sup>
+7.7cm FK 16                     NT QSU h-d AP6 s5               NT QSU h-d AP6 s5               11      F†
+76.2mm P obr. 02/30             NT QSU h-d AP6 s6               NT QSU h-d AP6 s6               11      D† F†<sup>1</sup>
+OQF 18-Pounder                  NT QSU h-d AP6 WP5 s6           NT QSU h-d AP6 WP5 s6           11      <s>B</s>
+10.5cm leFH 16                  NT h-d s6                       NT h-d s6                       12†     A
+Cannone da 105/28               NT AP5 s6                       NT AP5 s6                       12      F†
+M2A1 105mm Howitzer             NT C5† WP7 s6                   NT C5† WP7 s6                   12      B C†
+122mm G obr. 10/30              NT h-d s6                       NT h-d s6                       13      <s>B</s> D†
+122mm G obr. 38                 NT s6                           NT s6                           13      <s>B</s> D†
+Obice da 149/13                 NT h-d[C]† WP6[B]† s5           NT h-d[C]† s5                   14†     n/a
+Oerlikon FF                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+Cannone-mitragliera da 20/65    T LF [NT, 20†[1], 2 ROF]        T LF [NT, 20†[1], 2 ROF]        15†[2]  D† G†<sup>1</sup>
+2cm FlaK 30                     T LF [NT, 20†, 2 ROF, B10]      T LF [NT, 20†, 2 ROF, B10]      15†[1]  G†
+3.7cm FlaK 36 o. 37             T AP6                           T AP6                           16      <s>B</s>
+Bofors 40mm L/60                T AP6 LF [40†[1], 2 ROF]        T AP6 LF [40†[1], 2 ROF]        16†     G†<sup>1</sup>
+Bofors 75mm M29                 T AP6 LF [75†[1], 1 ROF, B10†]  T AP6 LF [75†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
+8.8cm FlaK 18                   T AP6 LF [88†[1], 1 ROF, B10†]  T AP6 LF [88†[1], 1 ROF, B10†]  17      <s>B</s> D† G†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
index d12ecd2..b468052 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1940.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1940 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
index edf88b3..40d1013 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1941.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1941 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
index af37b0e..e6ec25c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1942.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1942 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
index ceafe3e..763e134 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1943.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1943 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
index ddb830f..9715300 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1944.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1944 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
index f36a43f..a01c6d6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/croatian/1945.txt
@@ -1,6 +1,6 @@
 === ordnance/croatian/1945 ===
 
-Name              Capabilities     (effective)        #  Notes
-----------------  ---------------  ---------------  ---  -------
-Canonne da 65/17  NT no Gunshield  NT no Gunshield   35  A
-Skoda M28(FE)     NT               NT                36  A
+Name              Capabilities    (effective)      #  Notes    Comments
+----------------  --------------  -------------  ---  -------  -------------
+Canonne da 65/17  NT              NT              35  A        No Gunshield.
+Skoda M28(FE)     NT              NT              36  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
index bfee8ee..260d530 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1940.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1940 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
index 77325be..71a191c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1941.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1941 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
index 454d5d7..9b65a27 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1942.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1942 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
index b96f71f..361a3b7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1943.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1943 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
index e92add0..f3cd9ec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1944.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1944 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
index 6b8b1f5..0158eb3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/danish/1945.txt
@@ -1,5 +1,5 @@
 === ordnance/danish/1945 ===
 
-Name                     Capabilities           (effective)            #    Notes
------------------------  ---------------------  ---------------------  ---  -----------------
+Name                     Capabilities           (effective)            #    Notes              Comments
+-----------------------  ---------------------  ---------------------  ---  -----------------  ----------
 Machinecannon 20mm M-35  NT QSU†[1] R2 IFE=B10  NT QSU†[1] R2 IFE=B10  19†  De T†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
index 6d6a84b..64a0610 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1940.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1940 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
index 5d63a2d..dfea359 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1941.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1941 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
index 21cf4ec..43e099a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1942.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1942 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
index 6db63ea..87caf17 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1943.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1943 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
index 4d4b45a..d9c9b5b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1944.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1944 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
index 8ffe550..46055a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/dutch/1945.txt
@@ -1,5 +1,10 @@
 === ordnance/dutch/1945 ===
 
-Name                 Capabilities    (effective)      #  Notes
--------------------  --------------  -------------  ---  -------
-Solothurn s/18-1100  5PP             5PP             15  A Ne
+Name                         Capabilities                      (effective)                         #  Notes    Comments
+---------------------------  --------------------------------  --------------------------------  ---  -------  ----------
+Solothurn s/18-1100          5PP                               5PP                                15  A Ne
+Brandt 47mm Mortar                                                                                 1  n/a
+Krupp 75mm M1933 Field Gun   NT QSU C4†                        NT QSU C4†                          2  US C†
+Bofors 105mm M1924 Howitzer  T LF [NT, B11]                    T LF [NT, B11]                      3  n/a
+20mm Rheinmetall AA          T LF [20†, 2 ROF, B11, NT]        T LF [20†, 2 ROF, B11, NT]          4  Gr C†
+Bofors 80mm M29/38           T LF [80†, 1 ROF, B11] AP TK# 17  T LF [80†, 1 ROF, B11] AP TK# 17    6  AxM G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
index 990c000..7c2d7a2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1940.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1940 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU 5PP dm                                                  3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU                                                         10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
index 0e314cb..6e976ca 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1941.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1941 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU 5PP dm                                                  3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
index e59020b..65c21f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1942.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1942 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP                                                            2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU s8† 5PP dm                                              3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU                                                         11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
index 1943c80..9b426b1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1943.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1943 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT s8                                                          28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d s6                                                      29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
index 78c1dc5..55e2fe4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1944.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1944 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d s8                                                      23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT s8                                                          25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT H4 WP6 s8                                                   28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d WP6 s6                                                  29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
index d0a4cec..6d51354 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/finnish/1945.txt
@@ -1,15 +1,15 @@
 === ordnance/finnish/1945 ===
 
-Name                 Capabilities                                                   (effective)                                                    #    Notes
--------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------
+Name                 Capabilities                                                   (effective)                                                    #    Notes               Comments
+-------------------  -------------------------------------------------------------  -------------------------------------------------------------  ---  ------------------  ---------------------------
 47 Krh/41            2PP                                                            2PP                                                            1    A
 50 Krh/39(r)         4PP B12[3+]†                                                   4PP B12†                                                       2†   A B
 81 Krh/32            NT QSU IR[3+]† s8[N1]† 5PP dm                                  NT QSU IR† s8† 5PP dm                                          3†   A
 81 Savunheitin M/42  NT QSU s† 4PP dm                                               NT QSU s† 4PP dm                                               4†   A
 120 Krh/40           NT QSU                                                         NT QSU                                                         5†   n/a
-Boys ATR(b)          1PP "British"†                                                 1PP "British"†                                                 6†   n/a
-Lahti ATR            4PP Light AA fire in 44+† B30.35†                              4PP Light AA fire in 44+† B30.35†                              7†   A
-20 PstK/40           NT QSU Towing NA†[1] R2 IFE=B10                                NT QSU Towing NA†[1] R2 IFE=B10                                8†   C†<sup>1</sup>
+Boys ATR(b)          1PP                                                            1PP                                                            6†   n/a                 "British"†
+Lahti ATR            4PP B30.35†                                                    4PP B30.35†                                                    7†   A                   Light AA fire in 44+†
+20 PstK/40           NT QSU R2 IFE=B10                                              NT QSU R2 IFE=B10                                              8†   C†<sup>1</sup>      Towing NA†<sup>1</sup>
 25 PstK/37(f)        NT QSU                                                         NT QSU                                                         9†   B D
 37 PstK/36(s)        NT QSU HE[1+]†                                                 NT QSU HE†                                                     10†  A B
 37 PstK/37(g)        NT QSU H6[9][3+]†                                              NT QSU H6[9]†                                                  11†  B D
@@ -22,21 +22,21 @@ Lahti ATR            4PP Light AA fire in 44+† B30.35†
 76 LK/13             NT QSU s6                                                      NT QSU s6                                                      18   n/a
 76 K/02(r)           NT QSU h-d s6                                                  NT QSU h-d s6                                                  19†  B
 76 K/36(r)           NT QSU s6                                                      NT QSU s6                                                      20†  B E†<sup>1</sup>
-87 K/95              NT QSU no IF h-d Acq. NA†                                      NT QSU no IF h-d Acq. NA†                                      21   F†
-90 K/77              NT QSU no IF Acq. NA†[1] h-d                                   NT QSU no IF Acq. NA†[1] h-d                                   22†  F†<sup>1</sup>
+87 K/95              NT QSU h-d                                                     NT QSU h-d                                                     21   F†                  No IF. Acq. NA†
+90 K/77              NT QSU h-d                                                     NT QSU h-d                                                     22†  F†<sup>1</sup>      No IF. Acq. NA†<sup>1</sup>
 105 H/33(g)          NT h-d H6[A4+]† s8                                             NT h-d H6† s8                                                  23†  B
 105 H/37             NT s6                                                          NT s6                                                          24†  n/a
 105 H/41(t)          NT H6[A4+]† s8                                                 NT H6† s8                                                      25†  B
 107 K 10/13          NT s5                                                          NT s5                                                          26†  n/a
-107 K/77(r)          NT no IF Acq. NA†[1] h-d                                       NT no IF Acq. NA†[1] h-d                                       27†  B F†<sup>1</sup>
+107 K/77(r)          NT h-d                                                         NT h-d                                                         27†  B F†<sup>1</sup>    No IF. Acq. NA†<sup>1</sup>
 114 H/18(b)          NT H4[4+] WP6[4+] s8                                           NT H4 WP6 s8                                                   28†  n/a
 122 H/10(r)          NT h-d WP6[4+] s6                                              NT h-d WP6 s6                                                  29†  B
 150 H/40(g)          NT NM H6 s8                                                    NT NM H6 s8                                                    30   B
 155 H/17(f)          NT s6                                                          NT s6                                                          31   B
-7.62 ItKK/31-40      T QSU Towing NA†[1] 2 TK DR†                                   T QSU Towing NA†[1] 2 TK DR†                                   32†  C†<sup>1</sup>
+7.62 ItKK/31-40      T QSU 2 TK DR†                                                 T QSU 2 TK DR†                                                 32†  C†<sup>1</sup>      Towing NA†<sup>1</sup>
 20 ItK/30 BSW(g)     T LF [NT, 20†, 2 ROF, B10]                                     T LF [NT, 20†, 2 ROF, B10]                                     33   B G†
 20 ItK/38 BSW(g)     T LF [NT, 20†[1], 2 ROF, B11]                                  T LF [NT, 20†[1], 2 ROF, B11]                                  34†  B G†<sup>1</sup>
-20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          T LF [NT, 20†[1], 2 ROF] Road MP = 1†                          35†  A D G†<sup>1</sup>
+20 ItK/35 Br         T LF [NT, 20†[1], 2 ROF]                                       T LF [NT, 20†[1], 2 ROF]                                       35†  A D G†<sup>1</sup>  Road MP = 1†
 20 ItK/40 VKT        T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  T LF [NT, 20†[1], 2 ROF, 8 IFE, B11] 2 TK DR† Unhooking risk†  36†  D G†<sup>1</sup>
 40 ItK/35-39 B(s)    T LF [40†[1], 2 ROF]                                           T LF [40†[1], 2 ROF]                                           37†  B G†<sup>1</sup>
 76 ItK/28 B(s)       T LF [NT, 76†, 1 ROF]                                          T LF [NT, 76†, 1 ROF]                                          38   B G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
index 271ebe1..c1b6635 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1940.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1940 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA†                      2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA†                 2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
index 72d3f9d..cd3fa50 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1941.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1941 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA†                      2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA†                 2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
index 1476173..2ccc914 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1942.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1942 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
index a7c2546..fab1144 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1943.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1943 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
index 19a4e01..73727de 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1944.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1944 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
index b43aeb3..07ab76b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/french/1945.txt
@@ -1,25 +1,25 @@
 === ordnance/french/1945 ===
 
-Name                               Capabilities                     (effective)                      #       Notes
----------------------------------  -------------------------------  -------------------------------  ------  --------
-LG de 50 mle 37(f)                 2PP crewed†                      2PP crewed†                      1       A B C† E
-Mortier de 60 mle 35               5PP no OBA† IR[2+]†              5PP no OBA† IR†                  2†      A B V
-Mortier de 81 mle 27/31            NT QSU s8                        NT QSU s8                        3†      A B D V
-Fusil Antichar Boys                1PP                              1PP                              4†      B
-Canon AC de 25 SA-L mle 34         NT QSU                           NT QSU                           5†      B P
-Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]             NT QSU APCR only†[1]             6†[1]   B G† P V
-Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST no shield  h-d HE7 LF [NT] s6 ST no shield  7       E
-Canon de 37 mle 16 TR              5PP (3PP dm) crewed†             5PP (3PP dm) crewed†             8†[1]   A C†
-Canon de 65 M mle 06               NT QSU no Gunshield h-d          NT QSU no Gunshield h-d          9†      A P
-Canon de 75 M mle 28               NT QSU h-d AP5 s6                NT QSU h-d AP5 s6                10†     A P
-Canon de 75 mle 1897               NT QSU s8                        NT QSU s8                        11†     B P
-Canon de 105 M mle 28              NT h-d                           NT h-d                           12†     A P
-Canon de 105 C mle 35 B            NT                               NT                               13      E F†
-Canon de 105 L mle 13 S            NT                               NT                               14†     P
-Canon de 105 L mle 36 S            NT                               NT                               15      E F†
-Canon de 155 C mle 17 S            NT s8                            NT s8                            16†     n/a
-Canon de 155 GPF                   NT RFNM no IF                    NT RFNM no IF                    17†     n/a
-Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1] Towing NA†[1]      T 2 TK DR†[1] Towing NA†[1]      18†[1]  B G† V
-Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]       T LF [NT, 20†, 2 ROF, B11]       19†     n/a
-Canon Automatique de 25 CA mle 38  T                                T                                20†[1]  G†
-Canon de 75 CA mle 32              T NM                             T NM                             21†     n/a
+Name                               Capabilities                (effective)                 #       Notes     Comments
+---------------------------------  --------------------------  --------------------------  ------  --------  ----------------------
+LG de 50 mle 37(f)                 2PP                         2PP                         1       A B C† E  crewed†
+Mortier de 60 mle 35               5PP no OBA† IR[2+]†         5PP no OBA† IR†             2†      A B V
+Mortier de 81 mle 27/31            NT QSU s8                   NT QSU s8                   3†      A B D V
+Fusil Antichar Boys                1PP                         1PP                         4†      B
+Canon AC de 25 SA-L mle 34         NT QSU                      NT QSU                      5†      B P
+Canon AC de 47 SA mle 37 APX       NT QSU APCR only†[1]        NT QSU APCR only†[1]        6†[1]   B G† P V
+Canon de 75 AC mle 97/35           h-d HE7 LF [NT] s6 ST       h-d HE7 LF [NT] s6 ST       7       E         no shield
+Canon de 37 mle 16 TR              5PP (3PP dm)                5PP (3PP dm)                8†[1]   A C†      crewed†
+Canon de 65 M mle 06               NT QSU h-d                  NT QSU h-d                  9†      A P       No Gunshield.
+Canon de 75 M mle 28               NT QSU h-d AP5 s6           NT QSU h-d AP5 s6           10†     A P
+Canon de 75 mle 1897               NT QSU s8                   NT QSU s8                   11†     B P
+Canon de 105 M mle 28              NT h-d                      NT h-d                      12†     A P
+Canon de 105 C mle 35 B            NT                          NT                          13      E F†
+Canon de 105 L mle 13 S            NT                          NT                          14†     P
+Canon de 105 L mle 36 S            NT                          NT                          15      E F†
+Canon de 155 C mle 17 S            NT s8                       NT s8                       16†     n/a
+Canon de 155 GPF                   NT RFNM                     NT RFNM                     17†     n/a       No IF.
+Mitrailleuse de 13.2 CAJ mle 30    T 2 TK DR†[1]               T 2 TK DR†[1]               18†[1]  B G† V    Towing NA†<sup>1</sup>
+Mitrailleuse de 20 CA mle 39 O     T LF [NT, 20†, 2 ROF, B11]  T LF [NT, 20†, 2 ROF, B11]  19†     n/a
+Canon Automatique de 25 CA mle 38  T                           T                           20†[1]  G†
+Canon de 75 CA mle 32              T NM                        T NM                        21†     n/a
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 8a9c9f6..b32f465 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU H6[9]†                          6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU                                 8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU                                 2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
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 fe106b2..b61be52 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU s7                              10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T LF [88L†, 1 ROF, B11]                30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A5                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
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 2d2ae6f..8df01ff 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A5 s7                           10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A5 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A5 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A6                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A5 s7                           10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A5 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
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 46af1e8..e363d5a 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A4 s7                           10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A4 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A4 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A5                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A4 s7                           10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A4 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
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 b5ba251..b8dd803 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
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 ec4049b..f1743cb 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,34 +1,38 @@
 === 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<sup>T</sup>
-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<sup>T</sup>
-7.5cm PaK 40         NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
-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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
-10.5cm LG 42         T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
-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<sup>T</sup>
-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
-2cm FlaKvierling 38  T 4TK DR†                              T 4TK DR†                              27†  N
-3.7cm FlaK 36 o. 37  T H5[9]†                               T H5[9]†                               28   B† N
-3.7cm FlaK 43        T                                      T                                      29   n/a
-8.8cm FlaK 18 o. 36  T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+Name                      Capabilities                           (effective)                            #    Notes             Comments
+------------------------  -------------------------------------  -------------------------------------  ---  ----------------  -------------------
+5cm leGrW                 5PP                                    5PP                                    1    N
+8cm GrW 34                NT QSU IR s8                           NT QSU IR s8                           2†   N
+10cm NbW 35               NT QSU s10                             NT QSU s10                             3    O
+12cm GrW 42               NT QSU s8                              NT QSU s8                              4†   n/a
+2.8cm sPzB 41             NT QSU                                 NT QSU                                 5†   A† N P            uses APCR TK Table†
+3.7cm PaK 35/36           NT QSU A4[1]5[2]4[3]3[4] H6[9]†        NT QSU A3 H6[9]†                       6    B† N P
+4.2cm lePaK 41            NT QSU                                 NT QSU                                 7    A† N<sup>T</sup>  uses APCR TK Table†
+5cm PaK 38                NT QSU A5[1]6[2]5[3]4[4]               NT QSU A4                              8†   N
+7.5cm PaK 97/38           NT QSU H6 s7                           NT QSU H6 s7                           9    N<sup>T</sup>
+7.5cm PaK 40              NT QSU A5[2]4[3]3[4] s7                NT QSU A3 s7                           10†  N<sup>T</sup>
+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, <b>M4</b>, -1]  T LF [88†, 1 ROF, B11, <b>M4</b>, -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<sup>T</sup>
+10.5cm LG 42              T QSU H6 s6                            T QSU H6 s6                            18†  N<sup>T</sup>
+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<sup>T</sup>
+17cm K 18                 NT RFNM AP6                            NT RFNM AP6                            24   N                 No IF.
+2cm FlaK 30               T LF [20†, 2 ROF, B10, NT]             T LF [20†, 2 ROF, B10, NT]             25   C† N
+2cm FlaK 38               T LF [20†, 2 ROF, B11, NT]             T LF [20†, 2 ROF, B11, NT]             26   C† N
+2cm FlaKvierling 38       T 4TK DR†                              T 4TK DR†                              27†  N
+3.7cm FlaK 36 o. 37       T H5[9]†                               T H5[9]†                               28   B† N
+3.7cm FlaK 43             T                                      T                                      29   n/a
+8.8cm FlaK 18 o. 36       T A5[2]4[3]3[4] LF [88L†, 1 ROF, B11]  T A3 LF [88L†, 1 ROF, B11]             30   C† N
+2cm Tankb&#252;sche S-18  5PP                                    5PP                                    1†   AxM A             No Long Range
+4.7 cm PaK 36(t)          NT QSU A5[1]4[2]                       NT QSU A4                              2†   n/a
+7.5 cm Geb G36            NT QSU H7†                             NT QSU H7†                             3†   Ge O
+10.5 cm Geb H40           NT QSU H8                              NT QSU H8                              4†   Ge O
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
index af5a02b..e945914 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1940 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
index 9c6cadb..6e803dc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1941 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
index a1a6da8..2d5c59d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1942 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
index 53e4f5b..5c256bc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1943 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
index b9f68f3..a438005 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1944 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
index 51baa18..9a505d4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/greek/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/greek/1945 ===
 
-Name             Capabilities    (effective)      #  Notes
----------------  --------------  -------------  ---  -------
+Name             Capabilities    (effective)      #  Notes    Comments
+---------------  --------------  -------------  ---  -------  ----------
 Vari 85/24 M     NT s5           NT s5           16  Gr
 OR 105/19        NT h-d          NT h-d          17  Gr
 3.7cm Bofors AA  T               T               18  Gr
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
index 9591190..adee1b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1940 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
index 6611a0e..1a11033 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1941 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
index 4aba318..ce0f1e9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1942 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
index 32b1b3c..525e23e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1943 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
index 48848be..90b4245 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1944 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
index 162897f..e13de55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/hungarian/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/hungarian/1945 ===
 
-Name                Capabilities               (effective)                #    Notes
-------------------  -------------------------  -------------------------  ---  --------------
+Name                Capabilities               (effective)                #    Notes           Comments
+------------------  -------------------------  -------------------------  ---  --------------  ----------
 5cm leGrW 39(h)     5PP                        5PP                        23   A
 40mm MAVAG 40 M     NT QSU H7[9]†              NT QSU H7[9]†              24†  n/a
 Skoda M05/08        NT                         NT                         25   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
new file mode 100644
index 0000000..8f22907
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1940.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1940 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
new file mode 100644
index 0000000..82e1e63
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1941.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1941 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
new file mode 100644
index 0000000..b79e75a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1942.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1942 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
new file mode 100644
index 0000000..9c4bc71
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1943.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1943 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
new file mode 100644
index 0000000..fb75e3b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1944.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1944 ===
+
+Name                               Capabilities                (effective)             #  Notes    Comments
+---------------------------------  --------------------------  --------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            4PP                     1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP    2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)            3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d              4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                  5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  NT QSU h-d AP TK#12     6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
new file mode 100644
index 0000000..7bcf98d
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/indonesian/1945.txt
@@ -0,0 +1,10 @@
+=== ordnance/indonesian/1945 ===
+
+Name                               Capabilities                (effective)                #  Notes    Comments
+---------------------------------  --------------------------  -----------------------  ---  -------  ----------
+Type 89 Heavy Grenade Launcher     S6[5] WP5[5] 4PP            S6 WP5 4PP                 1  n/a
+Type 97 Automatic Gun              Long Range is NA 5PP        Long Range is NA 5PP       2  Jp A
+Year-11 Flat-Trajectory INF Gun    5PP (3PP dm)                5PP (3PP dm)               3  Jp A
+Type 94 Rapid-Fire Gun             NT QSU h-d                  NT QSU h-d                 4  Jp A
+Type 1 Machine-Moved Gun           NT QSU                      NT QSU                     5  n/a
+Year-38 Type Field Gun (Improved)  WP5[5] NT QSU h-d AP TK#12  WP5 NT QSU h-d AP TK#12    6  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
index 0a90a80..1975351 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1940.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1940 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield                  5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU                 5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
index 61e65f3..985044b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1941.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1941 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield                  5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU                 5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
index 7f52841..5562887 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1942.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1942 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield                      6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU                               9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU s8                            10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU s8                            11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT                                   12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT                     6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU                 9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU s8              10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU s8              11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT                     12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
index fefe8fe..f17a45b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1943.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1943 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
index 95d0f09..19c3a55 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1944.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1944 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
index d45039d..3a9dcae 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/italian/1945.txt
@@ -1,24 +1,24 @@
 === ordnance/italian/1945 ===
 
-Name                          Capabilities                         (effective)                          #    Notes
-----------------------------  -----------------------------------  -----------------------------------  ---  -------------------------
-Mortaio da 45 "Brixia"        4PP                                  4PP                                  1    N
-Mortaio da 81/14              NT QSU IR s8                         NT QSU IR s8                         2†   N
-Fucile-cc S                   5PP                                  5PP                                  3    N
-Cannone-cc da 37/45           NT QSU                               NT QSU                               4†   C N <s>R</s>
-Cannone da 47/32              NT QSU no Gunshield Towed[A1+]†      NT QSU no Gunshield Towed†           5†   A C N
-Cannone da 65/17              NT no Gunshield H6[S2+]†[1]          NT no Gunshield H6†[1]               6†   A C H†<sup>1</sup> N
-Cannone da 70/15              NT QSU Acq. NA†[1] no Gunshield h-d  NT QSU Acq. NA†[1] no Gunshield h-d  7†   A B†<sup>1</sup> <s>R</s>
-Obice da 75/13                NT QSU                               NT QSU                               8†   A
-Cannone da 75/27              NT QSU H6[S2+]†[1]                   NT QSU H6†[1]                        9†   A C H†<sup>1</sup> N
-Obice da 75/18                NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     10†  A H†<sup>1</sup> N
-Cannone da 75/32              NT QSU H6[S2+]†[1] s8                NT QSU H6†[1] s8                     11†  H†<sup>1</sup>
-Obice da 100/17               NT H6[S2+]†[1]                       NT H6†[1]                            12†  A H†<sup>1</sup> N
-Cannone da 105/28             NT s8                                NT s8                                13†  N
-Obice 149/13                  NT                                   NT                                   14†  N
-Cannone da 149/35             NT RFNM no IF Acq. NA†[1] s8         NT RFNM no IF Acq. NA†[1] s8         15†  B†<sup>1</sup> N <s>R</s>
-Cannone da 149/40             NT RFNM                              NT RFNM                              16†  N
-Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]                T LF [NT, 20†, 2 ROF]                17†  A C N
-Cannone-aa da 75/39           T "16" AP TK#†                       T "16" AP TK#†                       18†  n/a
-Cannone-aa da 75/46           T                                    T                                    19†  N
-Cannone-aa da 90/53           T                                    T                                    20†  N <s>R</s>
+Name                          Capabilities           (effective)            #    Notes                      Comments
+----------------------------  ---------------------  ---------------------  ---  -------------------------  ----------------------------------
+Mortaio da 45 "Brixia"        4PP                    4PP                    1    N
+Mortaio da 81/14              NT QSU IR s8           NT QSU IR s8           2†   N
+Fucile-cc S                   5PP                    5PP                    3    N
+Cannone-cc da 37/45           NT QSU                 NT QSU                 4†   C N <s>R</s>
+Cannone da 47/32              NT QSU Towed[A1+]†     NT QSU Towed†          5†   A C N                      No Gunshield.
+Cannone da 65/17              NT H6[S2+]†[1]         NT H6†[1]              6†   A C H†<sup>1</sup> N       No Gunshield.
+Cannone da 70/15              NT QSU h-d             NT QSU h-d             7†   A B†<sup>1</sup> <s>R</s>  Acq. NA†<sup>1</sup> No Gunshield.
+Obice da 75/13                NT QSU                 NT QSU                 8†   A
+Cannone da 75/27              NT QSU H6[S2+]†[1]     NT QSU H6†[1]          9†   A C H†<sup>1</sup> N
+Obice da 75/18                NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       10†  A H†<sup>1</sup> N
+Cannone da 75/32              NT QSU H6[S2+]†[1] s8  NT QSU H6†[1] s8       11†  H†<sup>1</sup>
+Obice da 100/17               NT H6[S2+]†[1]         NT H6†[1]              12†  A H†<sup>1</sup> N
+Cannone da 105/28             NT s8                  NT s8                  13†  N
+Obice 149/13                  NT                     NT                     14†  N
+Cannone da 149/35             NT RFNM s8             NT RFNM s8             15†  B†<sup>1</sup> N <s>R</s>  No IF. Acq. NA†<sup>1</sup>
+Cannone da 149/40             NT RFNM                NT RFNM                16†  N
+Cannone-mitragliera da 20/65  T LF [NT, 20†, 2 ROF]  T LF [NT, 20†, 2 ROF]  17†  A C N
+Cannone-aa da 75/39           T "16" AP TK#†         T "16" AP TK#†         18†  n/a
+Cannone-aa da 75/46           T                      T                      19†  N
+Cannone-aa da 90/53           T                      T                      20†  N <s>R</s>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
index 7704873..935d48e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1940.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1940 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
index d5505d1..2f754cf 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1941.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1941 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
index ce3be74..f566aba 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1942.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1942 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
index bf2e6cd..3422aee 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1943.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1943 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d WP7               11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d WP7                              11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP6 LF [75, 1 ROF, B11]                   4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
index e4012d3..d99d166 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1944.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1944 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 WP5           10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d H6† WP7           11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 WP5                          10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d H6† WP7                          11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP LF [75, 1 ROF, B11]                    4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
index 1bc1ec6..6755216 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/japanese/1945.txt
@@ -1,31 +1,35 @@
 === ordnance/japanese/1945 ===
 
-Name                                                  Capabilities                 (effective)                  #       Notes
-----------------------------------------------------  ---------------------------  ---------------------------  ------  ------------------
-Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†              IR WP6† 4PP s7†              1†      n/a
-Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        2†      A B†<sup>1</sup>
-Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                   NT QSU WP5                   3†      A
-Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5        NT QSU 5PP dm†[1] WP5        4†      A B†<sup>1</sup>
-Type 97 Medium Close-Attack Gun                       NT Towing NA†[1]             NT Towing NA†[1]             5†      A C†<sup>1</sup>
-Type 97 Automatic Gun                                 5PP crew†                    5PP crew†                    6†      A
-Type 94 Rapid-Fire Gun                                NT QSU h-d                   NT QSU h-d                   7†      A
-Type 1 Machine-Moved Gun                              NT QSU                       NT QSU                       8†      n/a
-Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm) crewed†         5PP (3PP dm) crewed†         9†      A
-Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5     NT QSU h-d AP5 H6 WP5        10†     A
-Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7       NT QSU h-d H6† WP7           11†     A
-Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†  NT QSU h-d WP6 "12" AP TK#†  12†     n/a
-Type 90 Field Gun                                     NT QSU WP6                   NT QSU WP6                   13†     n/a
-Type 91 10cm Field Howitzer                           NT                           NT                           14†     n/a
-Type 92 10cm Cannon                                   NT AP5 WP5                   NT AP5 WP5                   15†     n/a
-Year-38 Type 12cm Howitzer                            NT h-d AP5                   NT h-d AP5                   16†     n/a
-Year-3 Type 14cm Naval Seacoast Gun                   T NM†                        T NM†                        17†[1]  D† E
-Year-4 Type 15cm Howitzer                             NT AP5 WP5 Towing risk†      NT AP5 WP5 Towing risk†      18†     n/a
-Type 96 15cm Howitzer                                 NT AP5 WP5                   NT AP5 WP5                   19†     E
-Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR† Towing NA†[1]     T 2 TK DR† Towing NA†[1]     20†     A C†<sup>1</sup> E
-Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]        T LF [NT, 20†, 2 ROF]        21†     A
-Type 96 Naval High-Angle Machine Cannon               T NM†                        T NM†                        22†[1]  D† E
-Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]            T NM† 2 TK DR†[1]            22†[1]  D† E
-Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]            T NM† 3 TK DR†[1]            22†[1]  D† E
-Type 88 7.5cm Mobile Field High-Angle Gun             T                            T                            23†     E
-Year-10 Type 12cm Naval High-Angle Gun                T NM†                        T NM†                        24†[1]  D† E
-Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]         T NM† "13" AP TK†[1]         25†[1]  D† E
+Name                                                  Capabilities                                (effective)                                 #       Notes               Comments
+----------------------------------------------------  ------------------------------------------  ------------------------------------------  ------  ------------------  ----------------------
+Type 89 Heavy Grenade Launcher                        IR WP6† 4PP s7†                             IR WP6† 4PP s7†                             1†      n/a
+Year-11 Type Curved-Fire Infantry Gun                 NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       2†      A B†<sup>1</sup>
+Type 97 Curved-Fire Infantry Gun                      NT QSU WP5                                  NT QSU WP5                                  3†      A
+Type 97 Light Close-Attack Gun                        NT QSU 5PP dm†[1] WP5                       NT QSU 5PP dm†[1] WP5                       4†      A B†<sup>1</sup>
+Type 97 Medium Close-Attack Gun                       NT                                          NT                                          5†      A C†<sup>1</sup>    Towing NA†<sup>1</sup>
+Type 97 Automatic Gun                                 5PP                                         5PP                                         6†      A                   crew†
+Type 94 Rapid-Fire Gun                                NT QSU h-d                                  NT QSU h-d                                  7†      A
+Type 1 Machine-Moved Gun                              NT QSU                                      NT QSU                                      8†      n/a
+Year-11 Type Flat-Trajectory Infantry Gun             5PP (3PP dm)                                5PP (3PP dm)                                9†      A                   crewed†
+Type 92 Infantry Gun                                  NT QSU h-d AP5 H6[5] WP5                    NT QSU h-d AP5 H6 WP5                       10†     A
+Year-41 Type Mountain Gun                             NT QSU h-d H6[4+]† WP7                      NT QSU h-d H6† WP7                          11†     A
+Year-38 Type Field Gun (Improved)                     NT QSU h-d WP6 "12" AP TK#†                 NT QSU h-d WP6 "12" AP TK#†                 12†     n/a
+Type 90 Field Gun                                     NT QSU WP6                                  NT QSU WP6                                  13†     n/a
+Type 91 10cm Field Howitzer                           NT                                          NT                                          14†     n/a
+Type 92 10cm Cannon                                   NT AP5 WP5                                  NT AP5 WP5                                  15†     n/a
+Year-38 Type 12cm Howitzer                            NT h-d AP5                                  NT h-d AP5                                  16†     n/a
+Year-3 Type 14cm Naval Seacoast Gun                   T NM†                                       T NM†                                       17†[1]  D† E
+Year-4 Type 15cm Howitzer                             NT AP5 WP5                                  NT AP5 WP5                                  18†     n/a                 Towing risk†
+Type 96 15cm Howitzer                                 NT AP5 WP5                                  NT AP5 WP5                                  19†     E
+Type 93 Twin-Mount High-Angle Machine Gun             T 2 TK DR†                                  T 2 TK DR†                                  20†     A C†<sup>1</sup> E  Towing NA†<sup>1</sup>
+Type 98 High-Angle Machine Cannon                     T LF [NT, 20†, 2 ROF]                       T LF [NT, 20†, 2 ROF]                       21†     A
+Type 96 Naval High-Angle Machine Cannon               T NM†                                       T NM†                                       22†[1]  D† E
+Type 96 Twin-Mount Naval High-Angle Machine Cannon    T NM† 2 TK DR†[1]                           T NM† 2 TK DR†[1]                           22†[1]  D† E
+Type 96 Triple-Mount Naval High-Angle Machine Cannon  T NM† 3 TK DR†[1]                           T NM† 3 TK DR†[1]                           22†[1]  D† E
+Type 88 7.5cm Mobile Field High-Angle Gun             T                                           T                                           23†     E
+Year-10 Type 12cm Naval High-Angle Gun                T NM†                                       T NM†                                       24†[1]  D† E
+Type 10 8cm Naval High-Angle Gun                      T NM† "13" AP TK†[1]                        T NM† "13" AP TK†[1]                        25†[1]  D† E
+Type 45 (1912) 24cm Howitzer                          NT NM No IF HE TK# 23 Tow NA                NT NM No IF HE TK# 23 Tow NA                1†      Jp D†<sup>1</sup>
+Type 91 Vickers AA Gun                                AP TK# 8 LF [40(4), 1 ROF, B10]             AP TK# 8 LF [40(4), 1 ROF, B10]             2†      n/a
+Type 91 Twin-mount Vickers AA Gun                     AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  AP TK# 8 2 TK DR's† LF [40(8), 1 ROF, B10]  3†      n/a
+Type 4 75mm AA                                        T AP6[44-] LF [75, 1 ROF, B11]              T AP LF [75, 1 ROF, B11]                    4†      Ch G
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
index e1fb527..141e94f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1940.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1940 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
index 219826b..c1b886c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1941.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1941 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
index 03e3bc0..c4298f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1942.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1942 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
index 57204e6..8782474 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1943.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1943 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
index 53271ce..9398f03 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1944.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1944 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
index 4504efa..2ddca42 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/polish/1945.txt
@@ -1,9 +1,19 @@
 === ordnance/polish/1945 ===
 
-Name                   Capabilities    (effective)    #    Notes
----------------------  --------------  -------------  ---  -------
-46mm granatnik wz. 36  4PP             4PP            1    A P
-Ur. wz. 35             1PP             1PP            2    P
-75mm wz. 02/26         NT QSU h-d s6   NT QSU h-d s6  3    P
-100mm wz. 14/19        NT              NT             4    A P
-75mm wz. 97/25         T NM            T NM           5†   P
+Name                   Capabilities           (effective)            #    Notes      Comments
+---------------------  ---------------------  ---------------------  ---  ---------  ---------------------
+46mm granatnik wz. 36  4PP                    4PP                    1    A P
+Ur. wz. 35             1PP                    1PP                    2    P
+75mm wz. 02/26         NT QSU h-d s6          NT QSU h-d s6          3    P
+100mm wz. 14/19        NT                     NT                     4    A P
+75mm wz. 97/25         T NM                   T NM                   5†   P
+FK-A wz.38 Autocannon  T QSU                  T QSU                  1    A AllM T†  No Gunshield. Tow NA†
+65mm wz.06             NT QSU C6† h-d         NT QSU C6† h-d         2    B† AllM A  No Gunshield.
+75mm wz.02/26          NT QSU h-d C6† s6      NT QSU h-d C6† s6      3    B†
+75mm wz.97             NT QSU C6† s8          NT QSU C6† s8          4    B†
+75mm wz.28             NT QSU h-d AP5 C6† s6  NT QSU h-d AP5 C6† s6  5    B† AllM A
+76mm wz.02             NT QSU h-d C6† s8      NT QSU h-d C6† s8      6    B†
+100mm wz.14/19         NT C6†                 NT C6†                 7    B† AllM A
+100mm wz.29            NT C4†                 NT C4†                 8    B†
+120mm wz.09/31         NT h-d C5† s6          NT h-d C5† s6          9    B†
+155mm wz.17            NT s8                  NT s8                  10   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
index 6787c6a..0953265 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1940.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1940 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
index 5155ead..49adb68 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1941.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1941 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
index c0ee3fc..d1f7c9d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1942.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1942 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
index 160ee7d..ea97ce6 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1943.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1943 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
index b155669..f975bf1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1944.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1944 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
index 6b6a6c6..01c5cae 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/romanian/1945.txt
@@ -1,26 +1,26 @@
 === ordnance/romanian/1945 ===
 
-Name                   Capabilities             (effective)              #    Notes
----------------------  -----------------------  -----------------------  ---  -------
-Brandt M35             IR 5PP                   IR 5PP                   1    A
-Bofors 37mm            NT QSU                   NT QSU                   2†   A
-45mm PTP obr. 32       NT QSU                   NT QSU                   3†   n/a
-Resita M43             NT QSU Blk TH AP TK#18†  NT QSU Blk TH AP TK#18†  4†   n/a
-76.2mm PaK 36(r)       NT QSU s7                NT QSU s7                5    K†
-Breda 47               NT QSU no Gunshield      NT QSU no Gunshield      6†   A
-75mm PP obr. 27        NT QSU H6 s8             NT QSU H6 s8             7    A
-75 M mle 28            NT QSU h-d AP5 s5        NT QSU h-d AP5 s5        8    A
-Skoda M14/34           NT AP6                   NT AP6                   9†   A
-76.2mm P obr. 00/02    NT QSU h-d s7            NT QSU h-d s7            10   n/a
-76.2mm P obr. 02/30    NT QSU h-d s7            NT QSU h-d s7            11   n/a
-76.2mm P obr. 39(r)    NT QSU s5                NT QSU s5                12   K†
-s 10cm K 18(g)         NT NM s5                 NT NM s5                 13   E
-Skoda M39(D9)          NT                       NT                       14   n/a
-Canon de 105L mle 36S  NT                       NT                       15   n/a
-Canon mle 10/12        NT h-d s4                NT h-d s4                16   n/a
-OQF 4.5in              NT s4                    NT s4                    17   n/a
-Skoda M28 NOa          NM no IF ST              NM no IF ST              18   n/a
-Skoda M33 (K1)         NT                       NT                       19   n/a
-CA mle 38              T                        T                        20   n/a
-Vickers/Resita M36/39  T                        T                        21†  n/a
-Kanon PL vz. 12/20     T NM                     T NM                     22   n/a
+Name                   Capabilities       (effective)        #    Notes    Comments
+---------------------  -----------------  -----------------  ---  -------  -------------
+Brandt M35             IR 5PP             IR 5PP             1    A
+Bofors 37mm            NT QSU             NT QSU             2†   A
+45mm PTP obr. 32       NT QSU             NT QSU             3†   n/a
+Resita M43             NT QSU AP TK#18†   NT QSU AP TK#18†   4†   n/a      Blk TH
+76.2mm PaK 36(r)       NT QSU s7          NT QSU s7          5    K†
+Breda 47               NT QSU             NT QSU             6†   A        No Gunshield.
+75mm PP obr. 27        NT QSU H6 s8       NT QSU H6 s8       7    A
+75 M mle 28            NT QSU h-d AP5 s5  NT QSU h-d AP5 s5  8    A
+Skoda M14/34           NT AP6             NT AP6             9†   A
+76.2mm P obr. 00/02    NT QSU h-d s7      NT QSU h-d s7      10   n/a
+76.2mm P obr. 02/30    NT QSU h-d s7      NT QSU h-d s7      11   n/a
+76.2mm P obr. 39(r)    NT QSU s5          NT QSU s5          12   K†
+s 10cm K 18(g)         NT NM s5           NT NM s5           13   E
+Skoda M39(D9)          NT                 NT                 14   n/a
+Canon de 105L mle 36S  NT                 NT                 15   n/a
+Canon mle 10/12        NT h-d s4          NT h-d s4          16   n/a
+OQF 4.5in              NT s4              NT s4              17   n/a
+Skoda M28 NOa          NM ST              NM ST              18   n/a      No IF.
+Skoda M33 (K1)         NT                 NT                 19   n/a
+CA mle 38              T                  T                  20   n/a
+Vickers/Resita M36/39  T                  T                  21†  n/a
+Kanon PL vz. 12/20     T NM               T NM               22   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
index 44a76c5..64f5323 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1940.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1940 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU s8                     15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU s8                     16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU s8         15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU s8         16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
index 404e2b9..d53349d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1941.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1941 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU                        8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU s8                     15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU s8                     16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU            8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU s8         15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU s8         16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
index 0a263bf..ab608db 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1942.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1942 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A4                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A4                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU                        9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A4 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A4         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A4         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU            9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A4 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
index cd0b6c0..300e4fc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1943.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1943 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A5                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A5                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A4                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A5 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU s8                     17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A5         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A5         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A4         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A5 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU s8         17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
index a15eda7..92dfd28 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1944.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1944 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A6                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A6                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A5                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A6 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU A5 s8                  17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A6         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A6         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A5         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A6 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU A5 s8      17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
index fd5d0c6..3c95596 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/russian/1945.txt
@@ -1,33 +1,36 @@
 === ordnance/russian/1945 ===
 
-Name                  Capabilities                  (effective)                   #     Notes
---------------------  ----------------------------  ----------------------------  ----  -------
-50mm RM obr. 40       4PP                           4PP                           1     n/a
-37mm PM-39            1PP Air Bursts &amp; Acq. NA  1PP Air Bursts &amp; Acq. NA  1.1   A
-82mm BM obr. 37       NT QSU IR s8                  NT QSU IR s8                  2†    n/a
-107mm GVPM obr. 38    NT QSU s8                     NT QSU s8                     3     A
-120mm PM obr. 38      NT QSU s8                     NT QSU s8                     4     n/a
-160mm PM obr. 43      NT no IF                      NT no IF                      5     n/a
-37mm PTP obr. 30      NT QSU                        NT QSU                        6     n/a
-45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A7                     7     n/a
-45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]      NT QSU A7                     8     n/a
-57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]          NT QSU A6                     9†    n/a
-100mm PTP obr. 44     NT                            NT                            10    n/a
-37mm PP obr. 15R      NT QSU h-d                    NT QSU h-d                    11    n/a
-76.2mm PP obr. 27     NT QSU H6 s8                  NT QSU H6 s8                  12    A
-76.2mm P obr. 00/02P  NT QSU h-d s8                 NT QSU h-d s8                 13    n/a
-76.2mm P obr. 02/30   NT QSU h-d s8                 NT QSU h-d s8                 14    n/a
-76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8   NT QSU A7 s8                  15†   n/a
-76.2mm P obr. 36      NT QSU A4[2] s8               NT QSU A4 s8                  16†   n/a
-85mm P obr. 44        NT QSU A5[4]6[5] s8           NT QSU A6 s8                  17    n/a
-107mm P obr. 10/30    NT h-d s8                     NT h-d s8                     18    n/a
-122mm G obr. 10/30    NT h-d s8                     NT h-d s8                     19    n/a
-122mm G obr. 38       NT H6 s8                      NT H6 s8                      20    n/a
-122mm P obr. 31       NT s8                         NT s8                         21    n/a
-152mm G obr. 38       NT                            NT                            22    n/a
-152mm GP obr. 37      NT                            NT                            23    n/a
-203mm B-4 obr. 1931   NT RFNM no IF                 NT RFNM no IF                 23.1  n/a
-25mm ZP obr. 40       T                             T                             24    n/a
-37mm ZP obr. 39       T                             T                             25†   n/a
-76.2mm ZP obr. 38     T                             T                             26†   n/a
-85mm ZP obr. 39       T                             T                             27    n/a
+Name                  Capabilities                 (effective)       #     Notes      Comments
+--------------------  ---------------------------  ----------------  ----  ---------  ------------------------
+50mm RM obr. 40       4PP                          4PP               1     n/a
+37mm PM-39            1PP                          1PP               1.1   A          Air Bursts &amp; Acq. NA
+82mm BM obr. 37       NT QSU IR s8                 NT QSU IR s8      2†    n/a
+107mm GVPM obr. 38    NT QSU s8                    NT QSU s8         3     A
+120mm PM obr. 38      NT QSU s8                    NT QSU s8         4     n/a
+160mm PM obr. 43      NT                           NT                5     n/a        No IF.
+37mm PTP obr. 30      NT QSU                       NT QSU            6     n/a
+45mm PTP obr. 32      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A7         7     n/a
+45mm PTP obr. 42      NT QSU A4[2]5[3]6[4]7[5]     NT QSU A7         8     n/a
+57mm PTP obr. 43      NT QSU A4[3]5[4]6[5]         NT QSU A6         9†    n/a
+100mm PTP obr. 44     NT                           NT                10    n/a
+37mm PP obr. 15R      NT QSU h-d                   NT QSU h-d        11    n/a
+76.2mm PP obr. 27     NT QSU H6 s8                 NT QSU H6 s8      12    A
+76.2mm P obr. 00/02P  NT QSU h-d s8                NT QSU h-d s8     13    n/a
+76.2mm P obr. 02/30   NT QSU h-d s8                NT QSU h-d s8     14    n/a
+76.2mm P obr. 39      NT QSU A4[2]5[3]6[4]7[5] s8  NT QSU A7 s8      15†   n/a
+76.2mm P obr. 36      NT QSU A4[2] s8              NT QSU A4 s8      16†   n/a
+85mm P obr. 44        NT QSU A5[4]6[5] s8          NT QSU A6 s8      17    n/a
+107mm P obr. 10/30    NT h-d s8                    NT h-d s8         18    n/a
+122mm G obr. 10/30    NT h-d s8                    NT h-d s8         19    n/a
+122mm G obr. 38       NT H6 s8                     NT H6 s8          20    n/a
+122mm P obr. 31       NT s8                        NT s8             21    n/a
+152mm G obr. 38       NT                           NT                22    n/a
+152mm GP obr. 37      NT                           NT                23    n/a
+203mm B-4 obr. 1931   NT RFNM                      NT RFNM           23.1  n/a        No IF.
+25mm ZP obr. 40       T                            T                 24    n/a
+37mm ZP obr. 39       T                            T                 25†   n/a
+76.2mm ZP obr. 38     T                            T                 26†   n/a
+85mm ZP obr. 39       T                            T                 27    n/a
+37mm PTP obr. 30      NT QSU C5†                   NT QSU C5†        1     B†
+37mm PP obr. 15R      NT QSU h-d C5†               NT QSU h-d C5†    2     B†
+76.2mm PP obr. 27     NT QSU C6† H6 s8             NT QSU C6† H6 s8  3     A B† Ru A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
index 7db49ad..3a6eb36 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1940.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1940 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU                29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU         29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
index 32c9d10..02c9d11 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1941.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1941 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A5             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A5      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
index 012a0b8..fe69724 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1942.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1942 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU                30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU         30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
index a0a487e..33b9070 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1943.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1943 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
index 58a76e8..614744c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1944.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1944 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
index 81f59c1..706bbd9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/slovakian/1945.txt
@@ -1,11 +1,11 @@
 === ordnance/slovakian/1945 ===
 
-Name                 Capabilities          (effective)           #    Notes
--------------------  --------------------  --------------------  ---  -------
-Minomet vz. 36       NT QSU                NT QSU                28   A
-Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]      NT QSU A4             29   E
-leIG 18(g)           NT QSU H7[3+]         NT QSU H7             30   A E
-Skoda M37(K4)        NT s6                 NT s6                 31   n/a
-Skoda 47L40(t)       T QSU AA Fire ROF 2†  T QSU AA Fire ROF 2†  32†  E
-Skoda PL vz. 37(t)   T                     T                     33   E
-Kanon PL vz. 22/24   ST                    ST                    34†  n/a
+Name                 Capabilities      (effective)    #    Notes    Comments
+-------------------  ----------------  -------------  ---  -------  --------------
+Minomet vz. 36       NT QSU            NT QSU         28   A
+Kanon PUV vz. 36(t)  NT QSU A5[1]4[2]  NT QSU A4      29   E
+leIG 18(g)           NT QSU H7[3+]     NT QSU H7      30   A E
+Skoda M37(K4)        NT s6             NT s6          31   n/a
+Skoda 47L40(t)       T QSU             T QSU          32†  E        AA Fire ROF 2†
+Skoda PL vz. 37(t)   T                 T              33   E
+Kanon PL vz. 22/24   ST                ST             34†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
new file mode 100644
index 0000000..ec631a7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1940.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1940 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
new file mode 100644
index 0000000..c0f1920
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1941.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1941 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
new file mode 100644
index 0000000..4e04e2f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1942.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1942 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
new file mode 100644
index 0000000..1e8c399
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1943.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1943 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
new file mode 100644
index 0000000..dc313d7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1944.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1944 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
new file mode 100644
index 0000000..ebba131
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/thai/1945.txt
@@ -0,0 +1,8 @@
+=== ordnance/thai/1945 ===
+
+Name                       Capabilities               (effective)                  #  Notes    Comments
+-------------------------  -------------------------  -------------------------  ---  -------  -------------
+50mm Krupp M1906           NT QSU h-d                 NT QSU h-d                   4  n/a      No Gunshield.
+75mm Krupp M1908           NT QSU h-d AP8 WP5         NT QSU h-d AP8 WP5           5  n/a
+Vickers 12.7mm AA Class D  T QSU                      T QSU                        8  n/a
+Bofors M30 75mm AA         T AP6 LF [75, 1 ROF, B11]  T AP6 LF [75, 1 ROF, B11]    9  Ch G†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
index f769208..b312554 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1940.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1940 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
index a83d114..e3a4a01 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1941.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1941 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
index 3b37f33..8d3341d 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1942.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1942 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
index 08bd848..71bc55c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1943.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1943 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
index 666dca4..b9fd8b5 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1944.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1944 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
index 816f2c4..c24ed53 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/ordnance/yugoslavian/1945.txt
@@ -1,7 +1,7 @@
 === ordnance/yugoslavian/1945 ===
 
-Name                Capabilities    (effective)      #  Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)      #  Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 3.7cm Infantry Gun  NT QSU h-d      NT QSU h-d      20  Y
 80mm M28/M33        NT h-d s5       NT h-d s5       21  Y
 100mm M14/19        NT              NT              22  Y
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
index af7ca12..4b684d7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1940 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
index 4f0975f..8eb12b2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1941 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
index c7f8b71..5336680 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1942 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
index 3f94260..c487184 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1943 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
index cd88fa6..4b6f6d1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1944 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
index a1393bb..c5c1e91 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/allied-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/allied-minor-common/1945 ===
 
-Name              Capabilities      (effective)       #    Notes
-----------------  ----------------  ----------------  ---  ------------------
+Name              Capabilities      (effective)       #    Notes               Comments
+----------------  ----------------  ----------------  ---  ------------------  ----------
 L5/30(i)          ® CS 2            ® CS 2            31   A
 L3/35(i)          ® CS 2            ® CS 2            31†  A D
 L6/40(i)          CS 2              CS 2              31†  A
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 1052656..af067fc 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,7 +1,7 @@
 === vehicles/american/1940 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
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 bdfa2e1..329a900 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,7 +1,7 @@
 === vehicles/american/1941 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
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 b9d5546..be813c6 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,7 +1,7 @@
 === vehicles/american/1942 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           CS 4                     2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
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 5818070..8844248 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,7 +1,7 @@
 === vehicles/american/1943 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4              2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     H9 WP9 CS 5              43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  CS 5[brewup]             9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  CS 5[brewup]             12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
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 46a73c7..75fe7bb 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,7 +1,7 @@
 === vehicles/american/1944 ===
 
-Name                 Capabilities                               (effective)              #       Notes
--------------------  -----------------------------------------  -----------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)              #       Notes                                                                      Comments
+-------------------  -----------------------------------------  -----------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                     1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4              2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4              3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                     56†     N
 2&#189;-Ton          cs 7                                       cs 7                     57†     N
 7&#189;-Ton          cs 7                                       cs 7                     58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                     1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                     2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                     3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                     4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                     5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6              6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                     7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                     8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5          9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6          10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                     11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  sM4 CS 5[brewup]         12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6       17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            sP5 CS 7                 23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     C4†[1] H9 WP9 CS 5       43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4              5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  sM5 CS 5[brewup]         9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  sM4 CS 5[brewup]         12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6          13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              sM8 CS 6                 16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
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 f65ae2b..d22cab9 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,7 +1,7 @@
 === vehicles/american/1945 ===
 
-Name                 Capabilities                               (effective)                  #       Notes
--------------------  -----------------------------------------  ---------------------------  ------  ---------------------------------------------------
+Name                 Capabilities                               (effective)                  #       Notes                                                                      Comments
+-------------------  -----------------------------------------  ---------------------------  ------  -------------------------------------------------------------------------  -------------------------------------------------------
 M2A4                 C10[P]†[1] CS 4                            CS 4                         1       B† C†<sup>1</sup> P
 M3                   C7[A2+]†[2] CS 4                           C7†[2] CS 4                  2†      B†<sup>1</sup> C†<sup>2</sup> N
 M3A1                 C7†[2] CS 4                                C7†[2] CS 4                  3†      C†<sup>2</sup> F†<sup>1</sup> G N
@@ -65,3 +65,32 @@ DUKW                 cs 7†[1]                                   cs 7†[1]
 1&#189;-Ton          cs 6                                       cs 6                         56†     N
 2&#189;-Ton          cs 7                                       cs 7                         57†     N
 7&#189;-Ton          cs 7                                       cs 7                         58†     N
+LVT(A)1(L)           C10[P]†[2] CS 6                            CS 6                         1       US 46†<sup>3</sup> C†<sup>2</sup> G H P T† X                               Refer to U.S. Vehicle Note 46 and diagram for the AAMG.
+LVT(A)2F             CS 7                                       CS 7                         2       US H P Q†<sup>1</sup> T†<sup>1</sup>
+LVT4F                cs 7                                       cs 7                         3†[2]   US 51† D†<sup>3</sup> H P T†<sup>1</sup>
+LVT(A)2FS            CS 7                                       CS 7                         4†[1]   US D†<sup>2</sup> H P T†
+LVT4(L)              CS 7                                       CS 7                         5       US 51† D†<sup>4</sup> H Q†<sup>3</sup> T†<sup>1</sup> X†<sup>2</sup>
+LVT(A)4(L)           C7[P]†[3] H8 WP9 CS 6                      H8 WP9 CS 6                  6       US 46†<sup>2</sup> C†<sup>3</sup> G H P T† X†<sup>1</sup>
+M3A1F                C7[P]† CS 4                                CS 4                         7       US C† G P
+M5A1 Satan           CS 4                                       CS 4                         8†      US P
+M4A2F                WP7 s5 sM5 cs 5                            WP7 s5 sM5 cs 5              9       US G P R
+M4A2(L)F             WP7 s5 sM8 cs 6                            WP7 s5 sM8 cs 6              10      US G P R
+Carrier .50cal(b)    CS 3                                       CS 3                         11†     n/a
+M5A1C                C7†[2] CS 4                                C7†[2] CS 4                  5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y A B
+M4C                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A1C                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  WP7†[3] s5 sM4 CS 5[brewup]  12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> A B
+M4A3C(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6              13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y A B
+M4A1C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4A3C(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y A B
+M4C(105)             C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6           17†     US C†<sup>1</sup> US Y A B
+M4A3C(105)           C7[P]†[1] H9 WP9 s7 sM8 CS 6               H9 WP9 s7 sM8 CS 6           17†     US C†<sup>1</sup> US Y A B
+M10C GMC             A5[A4E]6[5E]†[1] s5[5] sP5 CS 7            A6†[1] s5 sP5 CS 7           23†     US A†<sup>1</sup> US N US Y A B
+M8C HMC              C4[4+]†[1] H9 WP9 CS 5                     C4†[1] H9 WP9 CS 5           43†     US C†<sup>1</sup> US Y A B
+M5A1F                C7†[2] CS 4                                C7†[2] CS 4                  5†      US C†<sup>2</sup> US F†<sup>1</sup> US G US N US Y C
+M4F                  WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  8†      US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A1F                WP7[J4+]†[3] s5[J4+] sM5[4+] CS 5[brewup]  WP7†[3] s5 sM5 CS 5[brewup]  9†      US F†<sup>2</sup> US G US N US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F                WP7[J4+]†[3] s5[J4+] sM4[4+] CS 5[brewup]  WP7†[3] s5 sM4 CS 5[brewup]  12†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y US BB†<sup>3</sup> C
+M4A3F(75)W           WP7 s5 sM8 CS 6                            WP7 s5 sM8 CS 6              13†     US F†<sup>2</sup> US G US R†<sup>1</sup> US Y C
+M4A1F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           15†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> US Y C
+M4A3F(76)W           A4[A4]5[5]†[2] s5[5] sM8 CS 6              A5†[2] s5 sM8 CS 6           16†     US A†<sup>2</sup> US F†<sup>1</sup> US G US <s>P</s> Y C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt
new file mode 100644
index 0000000..2d0fe87
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1940.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1940 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt
new file mode 100644
index 0000000..239967d
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1941.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1941 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt
new file mode 100644
index 0000000..96d7811
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1942.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1942 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt
new file mode 100644
index 0000000..a3a4934
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1943.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1943 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt
new file mode 100644
index 0000000..59c2184
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1944.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1944 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt
new file mode 100644
index 0000000..817b9dc
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/anzac/1945.txt
@@ -0,0 +1,8 @@
+=== vehicles/anzac/1945 ===
+
+Name              Capabilities    (effective)    #    Notes              Comments
+----------------  --------------  -------------  ---  -----------------  ----------
+Matilda Frog      sD6 CS 5        sD6 CS 5       1†   n/a
+Matilda II(L)     sD6 CS 5        sD6 CS 5       2†   Br B†<sup>1</sup>
+Matilda II CS(L)  s9 sD6 CS 5     s9 sD6 CS 5    3†   Br S†<sup>1</sup>
+Valentine III CS  s9 sM8 CS 5     s9 sM8 CS 5    4†   Br S†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
index 21af8fa..0b42873 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1940 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
index 7ef93de..adf7ad8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1941 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
index 2dcbc1d..06a824e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1942 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
index 4713e33..1ac8c7c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1943 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
index 899235e..c8b09c8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1944 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
index 72706b0..0dd5fa3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/axis-minor-common/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/axis-minor-common/1945 ===
 
-Name            Capabilities            (effective)         #    Notes
---------------  ----------------------  ------------------  ---  ---------------------------------------
+Name            Capabilities            (effective)         #    Notes                                    Comments
+--------------  ----------------------  ------------------  ---  ---------------------------------------  ----------
 L3/35(i)        ® CS 2                  ® CS 2              29†  K†<sup>1</sup> E F G†<sup>2</sup> H C B
 FT-17M(f)       ® no IF CS 2            ® no IF CS 2        30†  D R C
 FT-17C(f)       ® AP9 CS 2              ® AP9 CS 2          30†  D R C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
index c26380d..e6ec425 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1940 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
index 288637a..e841bd8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1941 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
index 91dd774..7049012 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1942 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
index 4f032ad..91f5305 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1943 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
index 43171cd..3ff3291 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1944 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
index 048afe0..8b814df 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/belgian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/belgian/1945 ===
 
-Name              Capabilities     (effective)      #    Notes
-----------------  ---------------  ---------------  ---  ----------------
+Name              Capabilities     (effective)      #    Notes             Comments
+----------------  ---------------  ---------------  ---  ----------------  ----------
 VCL Mk VI/c47(b)  ® CS 2           ® CS 2           14†  A Q†<sup>1</sup>
 T-13 II(b)        ® CS 4[brewup]†  ® CS 4[brewup]†  15†  A
 T-13 III(b)       ® CS 4[brewup]   ® CS 4[brewup]   16   A
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 4e83d29..e4ea7d2 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
@@ -1,7 +1,7 @@
 === vehicles/british/1940 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
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 96d6d0f..5208476 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
@@ -1,7 +1,7 @@
 === vehicles/british/1941 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
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 8982459..33bf2d8 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
@@ -1,7 +1,7 @@
 === vehicles/british/1942 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
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 b3cae01..88f8649 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
@@ -1,7 +1,7 @@
 === vehicles/british/1943 ===
 
-Name                       Capabilities                                          (effective)                 #       Notes
--------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                 #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                    1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                    1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                    2†      n/a
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 a7f9387..b392f7e 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
@@ -1,7 +1,7 @@
 === vehicles/british/1944 ===
 
-Name                       Capabilities                                          (effective)                       #       Notes
--------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                       #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                          1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                          1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                          2†      n/a
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 c32e1a6..ec9a5d2 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
@@ -1,7 +1,7 @@
 === vehicles/british/1945 ===
 
-Name                       Capabilities                                          (effective)                       #       Notes
--------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------
+Name                       Capabilities                                          (effective)                       #       Notes                                                 Comments
+-------------------------  ----------------------------------------------------  --------------------------------  ------  ----------------------------------------------------  ----------
 Mark VIB                   sD6 CS 3                                              sD6 CS 3                          1†      N P
 Mark VIC                   sD6 CS 3                                              sD6 CS 3                          1†      n/a
 Tetrarch                   sD6 CS 3                                              sD6 CS 3                          2†      n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
index bbb4938..f6a6867 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1940.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1940 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
index 8890e30..74348d9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1941.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1941 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
index 98de2a2..822b5af 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1942.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1942 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
index 7b17f74..59f8ed4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1943.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1943 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
index d02b35d..9c54b3a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1944.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1944 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
index d4089d1..1d1f350 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/bulgarian/1945.txt
@@ -1,5 +1,5 @@
 === vehicles/bulgarian/1945 ===
 
-Name                Capabilities    (effective)    #    Notes
-------------------  --------------  -------------  ---  -------
+Name                Capabilities    (effective)    #    Notes    Comments
+------------------  --------------  -------------  ---  -------  ----------
 Vickers 6-Ton Mk E  ® C5† CS 3      ® C5† CS 3     28†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
index 7daf16a..32e6e7b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1940.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1940 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
index 6bdc4a5..12960bf 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1941.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1941 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
index 88296ed..0de84ab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1942.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1942 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
index 399ce02..2f31ef9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1943.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1943 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
index c5adb2f..badffab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1944.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1944 ===
 
-Name                   Capabilities               (effective)      #       Notes
----------------------  -------------------------  ---------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2           1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3             5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4             8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2             11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3           12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3             14†     A
-Carrier B(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3             14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7             15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†            16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7             16†     A
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
index 587ba90..1268a08 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese/1945.txt
@@ -1,25 +1,34 @@
 === vehicles/chinese/1945 ===
 
-Name                   Capabilities               (effective)           #       Notes
----------------------  -------------------------  --------------------  ------  ----------------------------------------
-VCL M1931(b)           ® CS 2                     ® CS 2                1†      A <s>B</s>
-L3/35(i)               ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
-PzKpfw IA(g)           ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
-Vickers 6-Ton Mk E(b)  ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
-T-26TU M33(r)          CS 3                       CS 3                  5†      A E†<sup>1</sup>
-M3A3(a)                C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
-M4A4(a)                WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
-M3A1(a)                CS 4                       CS 4                  8†      A B E†<sup>1</sup>
-Stuart Recon(a)        CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
-Type 22                ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
-PSW 221(g)             CS 2                       CS 2                  11†     A <s>B</s> F†
-PSW 222(g)             CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
-BA-20(r)               ® CS 3                     ® CS 3                12      A <s>B</s> F†
-BA-6(r)                ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
-VCL Mk VI Carrier(b)   CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
-Carrier A(b)           CS 3                       CS 3                  14†     A
-Carrier B(b)           CS 3                       CS 3                  14†     A E†<sup>1</sup>
-Carrier C(b)           CS 3                       CS 3                  14†     A E†<sup>1</sup>
-Henschel 33(g)         cs 7                       cs 7                  15†[1]  A F†
-Jeep(a)                cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
-2&#189;-Ton(a)         cs 7                       cs 7                  16†     A
+Name                           Capabilities               (effective)           #       Notes                                     Comments
+-----------------------------  -------------------------  --------------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2                1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3                  5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4                  8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2                  11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3                12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3                  14†     A
+Carrier B(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7                  15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7                  16†     A
+FT-17(f)                       ® CS 2                     ® CS 2                1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2                2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2                3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2                4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3                5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3                6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4                7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4                8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3                9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt
new file mode 100644
index 0000000..513e12b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1940.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1940 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt
new file mode 100644
index 0000000..5cc8928
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1941.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1941 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt
new file mode 100644
index 0000000..86a96d5
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1942.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1942 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt
new file mode 100644
index 0000000..858861b
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1943.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1943 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt
new file mode 100644
index 0000000..a686d30
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1944.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1944 ===
+
+Name                           Capabilities               (effective)      #       Notes                                     Comments
+-----------------------------  -------------------------  ---------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2           1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†          2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2           3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3    4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3             5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4      6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4             8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5             9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4           10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2             11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3             11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3           12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4           12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†            13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3             14†     A
+Carrier B(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3             14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7             15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†            16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7             16†     A
+FT-17(f)                       ® CS 2                     ® CS 2           1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2           2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2           3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2           4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3           5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3           6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4           7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4           8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3           9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt
new file mode 100644
index 0000000..c8e8ae7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/chinese~gmd/1945.txt
@@ -0,0 +1,34 @@
+=== vehicles/chinese~gmd/1945 ===
+
+Name                           Capabilities               (effective)           #       Notes                                     Comments
+-----------------------------  -------------------------  --------------------  ------  ----------------------------------------  ----------
+VCL M1931(b)                   ® CS 2                     ® CS 2                1†      A <s>B</s>
+L3/35(i)                       ® CS 2†                    ® CS 2†               2†      A <s>B</s> D†<sup>1</sup>
+PzKpfw IA(g)                   ® CS 2                     ® CS 2                3†      A <s>B</s> D†<sup>1</sup>
+Vickers 6-Ton Mk E(b)          ® C5†[2] CS 3              ® C5†[2] CS 3         4†      A <s>B</s> C†<sup>2</sup> E†<sup>1</sup>
+T-26TU M33(r)                  CS 3                       CS 3                  5†      A E†<sup>1</sup>
+M3A3(a)                        C9†[1] CS 4                C9†[1] CS 4           6†      A B C†<sup>1</sup> E†<sup>2</sup> G
+M4A4(a)                        WP7[J4+]† s8 CS 5[brewup]  WP7† s8 CS 5[brewup]  7†      A B E†<sup>1</sup> G
+M3A1(a)                        CS 4                       CS 4                  8†      A B E†<sup>1</sup>
+Stuart Recon(a)                CS 5                       CS 5                  9†      A B D†<sup>1</sup> E†<sup>2</sup>
+Type 22                        ® CS 4                     ® CS 4                10†[1]  <s>B</s> E†<sup>2</sup> F†
+PSW 221(g)                     CS 2                       CS 2                  11†     A <s>B</s> F†
+PSW 222(g)                     CS 3                       CS 3                  11†     A <s>B</s> E†<sup>1</sup> F†
+BA-20(r)                       ® CS 3                     ® CS 3                12      A <s>B</s> F†
+BA-6(r)                        ® CS 4                     ® CS 4                12      A <s>B</s> E†<sup>1</sup> F†
+VCL Mk VI Carrier(b)           CS 2†                      CS 2†                 13†     A <s>B</s> H†<sup>1</sup>
+Carrier A(b)                   CS 3                       CS 3                  14†     A
+Carrier B(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Carrier C(b)                   CS 3                       CS 3                  14†     A E†<sup>1</sup>
+Henschel 33(g)                 cs 7                       cs 7                  15†[1]  A F†
+Jeep(a)                        cs 2†                      cs 2†                 16†     A H†<sup>1</sup>
+2&#189;-Ton(a)                 cs 7                       cs 7                  16†     A
+FT-17(f)                       ® CS 2                     ® CS 2                1†      A Fr C Ru M†
+Type 94 Lt Armored Vehicle(j)  ® CS 2                     ® CS 2                2       A D Ru M†
+Type 97A Te-Ke(j)              ® CS 2                     ® CS 2                3       A D
+Type 97B Te-Ke(j)              ® CS 2                     ® CS 2                4       A C D
+Type 95 Ha-Go(j)               ® CS 3                     ® CS 3                5       A B† C D Jp 5†<sup>1</sup>
+BT-5(r)                        ® CS 3                     ® CS 3                6       A B†<sup>1</sup> Ru M†
+Type 89A Chi-Ro(j)             ® CS 4                     ® CS 4                7       A B† C D
+Type 97A Chi-Ha(j)             ® CS 4                     ® CS 4                8       A B† C D
+Type 31 Armored Car            ® CS 3                     ® CS 3                9†      B†<sup>1</sup> Ch F†
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
index fa4b355..91ed9cc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1940 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
index 7b6f242..b2d687b 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1941 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
index 4c56243..5f4411c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1942 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
index 021b0a7..287af90 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1943 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
index 355800f..ea38114 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1944 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
index d1f8d99..dcea9a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/croatian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/croatian/1945 ===
 
-Name              Capabilities    (effective)    #    Notes
-----------------  --------------  -------------  ---  --------------
+Name              Capabilities    (effective)    #    Notes           Comments
+----------------  --------------  -------------  ---  --------------  ----------
 TKS               ® CS 2          ® CS 2         24†  F
 TKS(L)            ® CS 2          ® CS 2         24†  F
 L6/40(i)          CS 2            CS 2           25   n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
index b9ee24c..d86a8a1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1940.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1940 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
index 5e4dfe4..9ea5888 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1941.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1941 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
index 100381a..58f4088 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1942.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1942 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
index d7566e6..f54669e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1943.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1943 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
index 57440ac..ff9d13f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1944.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1944 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
index d3d76db..438f033 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/danish/1945.txt
@@ -1,5 +1,5 @@
 === vehicles/danish/1945 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
 Nimbus  M8† †           M8† †          24†  n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
index 4f5c50b..1ae8e32 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1940.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1940 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
index f8fbd05..4b3a859 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1941.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1941 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
index f424309..e787ac1 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1942.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1942 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
index b4d4258..eb90f47 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1943.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1943 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
index 82aa065..1154299 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1944.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1944 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
index b0c1769..89c39c3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/dutch/1945.txt
@@ -1,11 +1,17 @@
 === vehicles/dutch/1945 ===
 
-Name                      Capabilities    (effective)    #    Notes
-------------------------  --------------  -------------  ---  --------
-VCL M1936(b)              ® CS 2          ® CS 2         25†  A V
-CTLS-4(a)                 ® CS 2          ® CS 2         26†  A V
-M36                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M38                       ® HE10 CS 5     ® HE10 CS 5    27   <s>V</s>
-M39                       ® HE10 CS 6     ® HE10 CS 6    28   <s>V</s>
-Marmon-Herrington III(b)  ® CS 4          ® CS 4         29†  A V
-Jeep(a)                   cs 2†           cs 2†          30†  A V
+Name                         Capabilities    (effective)    #       Notes                                     Comments
+---------------------------  --------------  -------------  ------  ----------------------------------------  ---------------------------------------------------------------------------------------------------
+VCL M1936(b)                 ® CS 2          ® CS 2         25†     A V
+CTLS-4(a)                    ® CS 2          ® CS 2         26†     A V
+M36                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M38                          ® HE10 CS 5     ® HE10 CS 5    27      <s>V</s>
+M39                          ® HE10 CS 6     ® HE10 CS 6    28      <s>V</s>
+Marmon-Herrington III(b)     ® CS 4          ® CS 4         29†     A V
+Jeep(a)                      cs 2†           cs 2†          30†     A V
+Alvis-Straussler AC3D        ® CS 4          ® CS 4         1†[2]   AllM V† Ch F†<sup>1</sup>                 CMG uses AP TK 12.7 column.
+Braat Overvalwagen APC       ® CS 5          ® CS 5         2†[2]   A†<sup>1</sup> Ch F†                      CMG: VCA only Mounted Fire: Full FP
+Braat Overvalwagen AA        ® CS 4          ® CS 4         3†[1]   AllM AA†<sup>2</sup> Ch F†                AAMG uses AP TK 12.7 column.
+Kanonwagen Armored Car       ® CS 4          ® CS 4         4††[1]  A†<sup>2</sup> AllM V† Ch F†<sup>1</sup>  VCA MA: VCA &#8804; level NA CMG may only fire within VCA. Rear turret is unarmored when TCA = VCA.
+Stadswacht Overvalwagen APC  CS 6            CS 6           5†[1]   Ch F†                                     Mounted Fire: Full FP Passengers may fire 2 LMG's without losing inherent FP.
+PLA Wagen                    CS 5            CS 5           6†      AllM AA†<sup>1</sup>                      AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
index 9ccbfd3..bcca042 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1940 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
index 13c17e3..a8a7ab4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1941 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
index f369cb2..d8d817a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1942 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
index b5b39d5..b9f14ab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1943 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
index 8e8be0b..627e5b7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1944 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
index bfddaeb..db60467 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/finnish/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/finnish/1945 ===
 
-Name                         Capabilities                (effective)                 #    Notes
----------------------------  --------------------------  --------------------------  ---  ----------------
+Name                         Capabilities                (effective)                 #    Notes             Comments
+---------------------------  --------------------------  --------------------------  ---  ----------------  ----------
 T-37(r)                      ® CS 2                      ® CS 2                      1†   D M
 T-50(r)                      CS 4                        CS 4                        2†   D
 Vikkersi(b)                  ® CS 3                      ® CS 3                      3†   B†<sup>1</sup> D
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
index dc9e0a2..10b5b2c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1940 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
index 013088e..d99155c 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1941 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
index 6e7e055..f3e74a4 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1942 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
index ef2201d..5377dce 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1943 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
index bc51005..2d56a48 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1944 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
index 41bcbf4..0e86576 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/french/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/french/1945 ===
 
-Name                       Capabilities                             (effective)                              #    Notes
--------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------
+Name                       Capabilities                             (effective)                              #    Notes                                                              Comments
+-------------------------  ---------------------------------------  ---------------------------------------  ---  -----------------------------------------------------------------  ----------
 FT-17M                     ® CS 2                                   ® CS 2                                   1†   C
 FT-17C                     ® AP9 CS 2                               ® AP9 CS 2                               1†   C
 FT-17 75BS                 ® no IF CS 3[brewup]                     ® no IF CS 3[brewup]                     1†   C
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 8be3eeb..9ecf1a1 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
@@ -1,124 +1,131 @@
 === vehicles/german/1940 ===
 
-Name                    Capabilities                   (effective)               #      Notes
-----------------------  -----------------------------  ------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             sD6 CS 4                  7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             sD7 CS 4                  8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                      9      A† E
-FT-17 730m(f)           CS 2                           CS 2                      9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                      9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 sD7 CS 5                  11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 sD7 CS 5                  12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 sD7 CS 6                  13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                      27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                      28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†  K
-PzJg Tiger              CS 7                           CS 7                      38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42     I P†
-PzJg I                  A5[1] HE7 CS 3                 HE7 CS 3                  43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 HE7 CS 3                  44     a
-Pz 35R 731(f)           CS 2                           CS 2                      44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                      51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56     n/a
-SPW 250/1               CS 4                           CS 4                      57     N
-SPW 250/sMG             CS 4†                          CS 4†                     58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60     Q†
-SPW 250/9               CS 4                           CS 4                      61†    A†
-SPW 250/10              A4[1] CS 4                     CS 4                      62     J† N
-SPW 251/1               CS 5                           CS 5                      63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                     58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64     C† N Q†
-SPW 251/10              A4[1] CS 4                     CS 4                      65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†    n/a
-SPW 251/21              CS 4                           CS 4                      66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2   a e
-Kfz 13                  CS 2                           CS 2                      68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                  69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                  70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                      71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                      74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                      84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                      85†    A†
-(Moebelwagen)           CS 6                           CS 6                      85†    A†
-FlaKPz IV/20            CS 6                           CS 6                      86     A†
-FlaKPz IV/37            CS 6                           CS 6                      87     A†
-SdKfz 10/4              CS 5                           CS 5                      88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                      88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                      89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                      90     A† D† N
-Kfz 4                   CS 3                           CS 3                      91†    N
-2cm FlaK LKW            CS 5                           CS 5                      92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                      92     A†
-Goliath                                                                          93†    L†
-Kfz 1                   cs 2†                          cs 2†                     94†    L† N
-Kfz 1/20                cs 2                           cs 2                      95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                      96     N
-Buessing-NAG 4500       cs 7                           cs 7                      96     N
-SdKfz 2                 cs 2                           cs 2                      97†    L† N
-SdKfz 7                 cs 6                           cs 6                      98     N
-SdKfz 11                cs 5                           cs 5                      99     N
+Name                    Capabilities                   (effective)               #       Notes                              Comments
+----------------------  -----------------------------  ------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             sD6 CS 4                  7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             sD7 CS 4                  8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                      9       A† E
+FT-17 730m(f)           CS 2                           CS 2                      9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                      9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 sD7 CS 5                  11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 sD7 CS 5                  12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 sD7 CS 6                  13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                      27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                      28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†   K
+PzJg Tiger              CS 7                           CS 7                      38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42      I P†
+PzJg I                  A5[1] HE7 CS 3                 HE7 CS 3                  43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 HE7 CS 3                  44      a
+Pz 35R 731(f)           CS 2                           CS 2                      44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                      51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56      n/a
+SPW 250/1               CS 4                           CS 4                      57      N
+SPW 250/sMG             CS 4†                          CS 4†                     58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60      Q†
+SPW 250/9               CS 4                           CS 4                      61†     A†
+SPW 250/10              A4[1] CS 4                     CS 4                      62      J† N
+SPW 251/1               CS 5                           CS 5                      63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                     58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64      C† N Q†
+SPW 251/10              A4[1] CS 4                     CS 4                      65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†     n/a
+SPW 251/21              CS 4                           CS 4                      66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2    a e
+Kfz 13                  CS 2                           CS 2                      68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                  69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                  70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                      71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                      74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                      84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                      85†     A†
+(Moebelwagen)           CS 6                           CS 6                      85†     A†
+FlaKPz IV/20            CS 6                           CS 6                      86      A†
+FlaKPz IV/37            CS 6                           CS 6                      87      A†
+SdKfz 10/4              CS 5                           CS 5                      88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                      88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                      89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                      90      A† D† N
+Kfz 4                   CS 3                           CS 3                      91†     N
+2cm FlaK LKW            CS 5                           CS 5                      92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                      92      A†
+Goliath                                                                          93†     L†
+Kfz 1                   cs 2†                          cs 2†                     94†     L† N
+Kfz 1/20                cs 2                           cs 2                      95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                      96      N
+Buessing-NAG 4500       cs 7                           cs 7                      96      N
+SdKfz 2                 cs 2                           cs 2                      97†     L† N
+SdKfz 7                 cs 6                           cs 6                      98      N
+SdKfz 11                cs 5                           cs 5                      99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                  1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                  2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                  3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                  4†      n/a
+Pz-7TP                  CS 3                           CS 3                      5       B†
+PSW M35                 CS 5                           CS 5                      6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 CS 6                      7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
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 fe56a35..c2d8a94 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
@@ -1,124 +1,131 @@
 === vehicles/german/1941 ===
 
-Name                    Capabilities                   (effective)               #      Notes
-----------------------  -----------------------------  ------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A4 sD6 CS 4               7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A4 sD7 CS 4               8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                      9      A† E
-FT-17 730m(f)           CS 2                           CS 2                      9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                      9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5               11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5               12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6               13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                      27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                      28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†  K
-PzJg Tiger              CS 7                           CS 7                      38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3               43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3               44     a
-Pz 35R 731(f)           CS 2                           CS 2                      44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                      51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56     n/a
-SPW 250/1               CS 4                           CS 4                      57     N
-SPW 250/sMG             CS 4†                          CS 4†                     58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60     Q†
-SPW 250/9               CS 4                           CS 4                      61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                   62     J† N
-SPW 251/1               CS 5                           CS 5                      63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                     58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                   65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†    n/a
-SPW 251/21              CS 4                           CS 4                      66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2   a e
-Kfz 13                  CS 2                           CS 2                      68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                  69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                  70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                      71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                      74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                      84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                      85†    A†
-(Moebelwagen)           CS 6                           CS 6                      85†    A†
-FlaKPz IV/20            CS 6                           CS 6                      86     A†
-FlaKPz IV/37            CS 6                           CS 6                      87     A†
-SdKfz 10/4              CS 5                           CS 5                      88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                      88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                      89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                      90     A† D† N
-Kfz 4                   CS 3                           CS 3                      91†    N
-2cm FlaK LKW            CS 5                           CS 5                      92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                      92     A†
-Goliath                                                                          93†    L†
-Kfz 1                   cs 2†                          cs 2†                     94†    L† N
-Kfz 1/20                cs 2                           cs 2                      95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                      96     N
-Buessing-NAG 4500       cs 7                           cs 7                      96     N
-SdKfz 2                 cs 2                           cs 2                      97†    L† N
-SdKfz 7                 cs 6                           cs 6                      98     N
-SdKfz 11                cs 5                           cs 5                      99     N
+Name                    Capabilities                   (effective)               #       Notes                              Comments
+----------------------  -----------------------------  ------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                  1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                  2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                  3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]         4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                  5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                  6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A4 sD6 CS 4               7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A4 sD7 CS 4               8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                      9       A† E
+FT-17 730m(f)           CS 2                           CS 2                      9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                  9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                 9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                      9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                  10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5               11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5               12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6               13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 sD7 CS 6                  14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 sD7 CS 5                  15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5            16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                  17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5           19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5        20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6        22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              s8 sD6 CS 6               23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              s8 sD5 CS 6               24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6               25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]          26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                      27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                      28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                   29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             M7† sD7 CS 6              30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                      31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                  32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4        33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              s8 sD7 CS 4               34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4               35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4            36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4            35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6          37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5            37.1†   K
+PzJg Tiger              CS 7                           CS 7                      38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                   40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3          41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                   42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3               43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3               44      a
+Pz 35R 731(f)           CS 2                           CS 2                      44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                  45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      HE7 s7 CS 4[brewup]       46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  HE7 s7 sD6 CS 4[brewup]   47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]   48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                  49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                  50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                      51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4               52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4               52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5          53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4              54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6              55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7              56      n/a
+SPW 250/1               CS 4                           CS 4                      57      N
+SPW 250/sMG             CS 4†                          CS 4†                     58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]        60      Q†
+SPW 250/9               CS 4                           CS 4                      61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                   62      J† N
+SPW 251/1               CS 5                           CS 5                      63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                     58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]        59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]        64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                   65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]              66†     n/a
+SPW 251/21              CS 4                           CS 4                      66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]       67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                  67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4          67.2    a e
+Kfz 13                  CS 2                           CS 2                      68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                  69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                  70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                  70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                      71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                  72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                  72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5            73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                      74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                  75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]       77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]  80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4          82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6          83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                      84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                      85†     A†
+(Moebelwagen)           CS 6                           CS 6                      85†     A†
+FlaKPz IV/20            CS 6                           CS 6                      86      A†
+FlaKPz IV/37            CS 6                           CS 6                      87      A†
+SdKfz 10/4              CS 5                           CS 5                      88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                      88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                      89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                      90      A† D† N
+Kfz 4                   CS 3                           CS 3                      91†     N
+2cm FlaK LKW            CS 5                           CS 5                      92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                      92      A†
+Goliath                                                                          93†     L†
+Kfz 1                   cs 2†                          cs 2†                     94†     L† N
+Kfz 1/20                cs 2                           cs 2                      95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                      96      N
+Buessing-NAG 4500       cs 7                           cs 7                      96      N
+SdKfz 2                 cs 2                           cs 2                      97†     L† N
+SdKfz 7                 cs 6                           cs 6                      98      N
+SdKfz 11                cs 5                           cs 5                      99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                  1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                  2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                  3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                  4†      n/a
+Pz-7TP                  CS 3                           CS 3                      5       B†
+PSW M35                 CS 5                           CS 5                      6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 CS 6                      7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
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 27c02d6..6777d8e 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
@@ -1,124 +1,131 @@
 === vehicles/german/1942 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                        27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]     48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                    75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                        27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  HE7 s7 sD5 CS 4[brewup]     48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 sD7 CS 4                    75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A5 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
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 6d9a996..f151928 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
@@ -1,124 +1,131 @@
 === vehicles/german/1943 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    CS 6                        27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              s8 sN9 CS 6                 25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    CS 6                        27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              CS 6                        31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              s8 sN9 CS 4                 35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 HE9 CS 3                    45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 HE7 CS 4                    50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       HE7 s7 CS 4                 52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       HE7 s7 CS 4                 52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 HE9 CS 4                    67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
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 10ed25e..7fb7cd0 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
@@ -1,124 +1,131 @@
 === vehicles/german/1944 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
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 576144b..74b92cc 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
@@ -1,124 +1,131 @@
 === vehicles/german/1945 ===
 
-Name                    Capabilities                   (effective)                 #      Notes
-----------------------  -----------------------------  --------------------------  -----  ---------------------------------
-PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†     N<sup>F</sup>
-PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2      n/a
-PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3      N
-PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†     n/a
-PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5      n/a
-PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†     n/a
-PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†     E
-PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†     E
-Aufklaerer 38(t)        CS 5                           CS 5                        9      A† E
-FT-17 730m(f)           CS 2                           CS 2                        9.1†   a c f
-FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†   a c f
-38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2    a b† f
-35-S 739(f)             CS 4                           CS 4                        9.3    a b†<sup>2</sup> d†<sup>1</sup> f
-PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†    n/a
-PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†    n/a
-PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12     N
-PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†    N
-PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†    N S
-PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†    B† N S
-PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16     B† N<sup>T</sup> S
-PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17     n/a
-PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†    n/a
-PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†    n/a
-PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20     N R†
-PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21     N R†
-PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22     N R†
-PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†    N S
-PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†    B† S
-PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25     S
-PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26     F†
-PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†    H†
-PzKpfw M15/42(i)        CS 4                           CS 4                        28     I
-PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29     I
-PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†    K N<sup>FT</sup>
-PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31     K
-PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†    K
-StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†    n/a
-StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†    N<sup>FT</sup> P† S
-StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35     O† Q† S
-StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†    N<sup>FT</sup> P† S
-StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35     O† Q† S
-StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†    S
-Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†  K
-PzJg Tiger              CS 7                           CS 7                        38     n/a
-StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39     I P†
-StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40     I P†
-StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41     I P†
-StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42     I P†
-PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43     N
-PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44     a
-Pz 35R 731(f)           CS 2                           CS 2                        44.1†  a
-Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†    a
-GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1   a e
-Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46     M† N<sup>FT</sup>
-Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47     E G N<sup>F</sup>
-Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48     E
-PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49     M†
-JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50     E O†
-JgdPz 38(t) (Fl)        CS 4                           CS 4                        51     E O†
-JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52     S
-JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52     S
-StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†    n/a
-JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†    S
-JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55     H
-JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56     n/a
-SPW 250/1               CS 4                           CS 4                        57     N
-SPW 250/sMG             CS 4†                          CS 4†                       58†    J† N
-SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     J† N
-SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60     Q†
-SPW 250/9               CS 4                           CS 4                        61†    A†
-SPW 250/10              A4[1] CS 4                     A4 CS 4                     62     J† N
-SPW 251/1               CS 5                           CS 5                        63     C† N
-SPW 251/sMG             CS 5†                          CS 5†                       58†    C† J† N
-SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59     C† J† N
-SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64     C† N Q†
-SPW 251/10              A4[1] CS 4                     A4 CS 4                     65     C† J† N
-SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†    n/a
-SPW 251/21              CS 4                           CS 4                        66.1†  n/a
-SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67     J†
-SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1   a e
-mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2   a e
-Kfz 13                  CS 2                           CS 2                        68†    n/a
-PSW 221                 sD6 CS 2                       sD6 CS 2                    69†    A† N
-PSW 222                 sD6 CS 3                       sD6 CS 3                    70†    A† N
-PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†    A† N<sup>F</sup>
-PSW 231 (6 rad)         CS 4                           CS 4                        71†    n/a
-PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†    N
-PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72     N<sup>F</sup>
-PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73     N<sup>T</sup>
-PSW 234/1               CS 5                           CS 5                        74     A†
-PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75     n/a
-PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76     Q†
-PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†    n/a
-sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78     G
-sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79     N
-sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80     E N<sup>FT</sup>
-PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81     M†
-PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82     a N
-GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1   a e
-PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83     n/a
-FlaKPz 38(t)            CS 4                           CS 4                        84     A† E
-37 FlaK/Pz IV           CS 5                           CS 5                        85†    A†
-(Moebelwagen)           CS 6                           CS 6                        85†    A†
-FlaKPz IV/20            CS 6                           CS 6                        86     A†
-FlaKPz IV/37            CS 6                           CS 6                        87     A†
-SdKfz 10/4              CS 5                           CS 5                        88     A† D† N
-SdKfz 10/5              CS 4                           CS 4                        88.1†  A†<sup>2</sup> D†<sup>1</sup>
-SdKfz 6/2               CS 5                           CS 5                        89     A† D† N
-SdKfz 7/1               CS 4                           CS 4                        90     A† D† N
-Kfz 4                   CS 3                           CS 3                        91†    N
-2cm FlaK LKW            CS 5                           CS 5                        92     A†
-3.7cm FlaK LKW          CS 5                           CS 5                        92     A†
-Goliath                                                                            93†    L†
-Kfz 1                   cs 2†                          cs 2†                       94†    L† N
-Kfz 1/20                cs 2                           cs 2                        95†    L†
-Opel 6700 (Blitz)       cs 6                           cs 6                        96     N
-Buessing-NAG 4500       cs 7                           cs 7                        96     N
-SdKfz 2                 cs 2                           cs 2                        97†    L† N
-SdKfz 7                 cs 6                           cs 6                        98     N
-SdKfz 11                cs 5                           cs 5                        99     N
+Name                    Capabilities                   (effective)                 #       Notes                              Comments
+----------------------  -----------------------------  --------------------------  ------  ---------------------------------  -------------------------
+PzKpfw IB               sD6 CS 2                       sD6 CS 2                    1†      N<sup>F</sup>
+PzKpfw IIA              sD6 CS 3                       sD6 CS 3                    2       n/a
+PzKpfw IIF              sD7 CS 3                       sD7 CS 3                    3       N
+PzKpfw II(Fl)           sD7† CS 2[brewup]              sD7† CS 2[brewup]           4†      n/a
+PzKpfw IIL              sD7 CS 4                       sD7 CS 4                    5       n/a
+PzKpfw 35t              sD5 CS 4                       sD5 CS 4                    6†      n/a
+PzKpfw 38(t)A           A4[1]5[2] sD6 CS 4             A5 sD6 CS 4                 7†      E
+PzKpfw 38(t)E           A4[1]5[2] sD7 CS 4             A5 sD7 CS 4                 8†      E
+Aufklaerer 38(t)        CS 5                           CS 5                        9       A† E
+FT-17 730m(f)           CS 2                           CS 2                        9.1†    a c f
+FT-17 730(f)            AP9 CS 2                       AP9 CS 2                    9.1†    a c f
+38H 735(f)              AP10 CS 3                      AP10 CS 3                   9.2     a b† f
+35-S 739(f)             CS 4                           CS 4                        9.3     a b†<sup>2</sup> d†<sup>1</sup> f
+PzKpfw IIID             sD6 CS 5                       sD6 CS 5                    10†     n/a
+PzKpfw IIIF             A4[1] sD7 CS 5                 A4 sD7 CS 5                 11†     n/a
+PzKpfw IIIG             A4[1] sD7 CS 5                 A4 sD7 CS 5                 12      N
+PzKpfw IIIH             A4[1] sD7 CS 6                 A4 sD7 CS 6                 13†     N
+PzKpfw IIIJ             A6[2] sD7 CS 6                 A6 sD7 CS 6                 14†     N S
+PzKpfw IIIL             A6[2] sD7 CS 5                 A6 sD7 CS 5                 15†     B† N S
+PzKpfw IIIN             H9 s9 sD7 CS 5                 H9 s9 sD7 CS 5              16      B† N<sup>T</sup> S
+PzKpfw III(Fl)          sD7 CS 3                       sD7 CS 3                    17      n/a
+PzKpfw IVA              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             18†     n/a
+PzKpfw IVC              AP7 s9 sD6 CS 5                AP7 s9 sD6 CS 5             19†     n/a
+PzKpfw IVD              AP7 H6 s9 sD7 CS 5             AP7 H6 s9 sD7 CS 5          20      N R†
+PzKpfw IVE              AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          21      N R†
+PzKpfw IVF<sub>1</sub>  AP7 H6 s9 sD7 CS 6             AP7 H6 s9 sD7 CS 6          22      N R†
+PzKpfw IVF<sub>2</sub>  A5[2] s8 sD6 CS 6              A5 s8 sD6 CS 6              23†     N S
+PzKpfw IVH              A5[2] s8 sD5 CS 6              A5 s8 sD5 CS 6              24†     B† S
+PzKpfw IVJ              A3[4] s8 sN9 CS 6              A3 s8 sN9 CS 6              25      S
+PzKpfw VD               sD5 CS 5[brewup]               sD5 CS 5[brewup]            26      F†
+PzKpfw VG               sN7[4] CS 6                    sN7 CS 6                    27†     H†
+PzKpfw M15/42(i)        CS 4                           CS 4                        28      I
+PzKpfw P26/40(i)        s8 CS 4                        s8 CS 4                     29      I
+PzKpfw VIE              A6[2] M7† sD7 CS 6             A6 M7† sD7 CS 6             30†     K N<sup>FT</sup>
+PzKpfw VIE (L)          A4[4] sN7[4] CS 6              A4 sN7 CS 6                 31      K
+PzKpfw VIB              sN9 CS 6                       sN9 CS 6                    32†     K
+StuG IIIB               AP7 H6 s9 sD7 CS 4             AP7 H6 s9 sD7 CS 4          33†     n/a
+StuG IIIG               A6[2] s8 sD7 CS 4              A6 s8 sD7 CS 4              34†     N<sup>FT</sup> P† S
+StuG IIIG (L)           A4[4] s8 sN9 CS 4              A4 s8 sN9 CS 4              35      O† Q† S
+StuH 42                 H9 s9 sD7 CS 4                 H9 s9 sD7 CS 4              36†     N<sup>FT</sup> P† S
+StuH 42 (L)             H9 s9 sN9 CS 4                 H9 s9 sN9 CS 4              35      O† Q† S
+StuPz IV                no IF H7 s9 CS 6               no IF H7 s9 CS 6            37†     S
+Sturmtiger              no IF sN9 CS 5                 no IF sN9 CS 5              37.1†   K
+PzJg Tiger              CS 7                           CS 7                        38      n/a
+StuG 75/18(i)           H7 s9 CS 3                     H7 s9 CS 3                  39      I P†
+StuG 75/34(i)           s9 CS 3                        s9 CS 3                     40      I P†
+StuG 105/25(i)          no IF H7 s9 CS 3               no IF H7 s9 CS 3            41      I P†
+StuG 75/46(i)           s9 CS 3                        s9 CS 3                     42      I P†
+PzJg I                  A5[1] HE7 CS 3                 A5 HE7 CS 3                 43      N
+PzJg 35R(f)             A5[1] HE7 CS 3                 A5 HE7 CS 3                 44      a
+Pz 35R 731(f)           CS 2                           CS 2                        44.1†   a
+Marder I                A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      45†     a
+GSW 39H(f) Pak          A4[4] HE9 CS 3                 A4 HE9 CS 3                 45.1    a e
+Marder II               A6[2] HE7 s7 CS 4[brewup]      A6 HE7 s7 CS 4[brewup]      46      M† N<sup>FT</sup>
+Marder III(t)H          A6[2] HE7 s7 sD6 CS 4[brewup]  A6 HE7 s7 sD6 CS 4[brewup]  47      E G N<sup>F</sup>
+Marder III(t)M          A5[3] HE7 s7 sD5 CS 4[brewup]  A5 HE7 s7 sD5 CS 4[brewup]  48      E
+PzJg III/IV             HE7 CS 5                       HE7 CS 5                    49      M†
+JgdPz 38(t)             A4[4] HE7 CS 4                 A4 HE7 CS 4                 50      E O†
+JgdPz 38(t) (Fl)        CS 4                           CS 4                        51      E O†
+JgdPz IV                A4[4] HE7 s7 sN7[4] CS 4       A4 HE7 s7 sN7 CS 4          52      S
+JgdPz IV (L)            A4[4] HE7 s7 sN8[4] CS 4       A4 HE7 s7 sN8 CS 4          52      S
+StuIG 33B               no IF H7 s9 CS 5               no IF H7 s9 CS 5            53†     n/a
+JgdPz IV/70             HE7 sN9 CS 4                   HE7 sN9 CS 4                54†     S
+JgdPz V                 HE7 sN9 CS 6                   HE7 sN9 CS 6                55      H
+JgdPz VI                HE7 sN9 CS 7                   HE7 sN9 CS 7                56      n/a
+SPW 250/1               CS 4                           CS 4                        57      N
+SPW 250/sMG             CS 4†                          CS 4†                       58†     J† N
+SPW 250/7               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      J† N
+SPW 250/8               H6 s8 CS 4[brewup]             H6 s8 CS 4[brewup]          60      Q†
+SPW 250/9               CS 4                           CS 4                        61†     A†
+SPW 250/10              A4[1] CS 4                     A4 CS 4                     62      J† N
+SPW 251/1               CS 5                           CS 5                        63      C† N
+SPW 251/sMG             CS 5†                          CS 5†                       58†     C† J† N
+SPW 251/2               IR s8 CS 4[brewup]             IR s8 CS 4[brewup]          59      C† J† N
+SPW 251/9               H6 s9 CS 4[brewup]             H6 s9 CS 4[brewup]          64      C† N Q†
+SPW 251/10              A4[1] CS 4                     A4 CS 4                     65      C† J† N
+SPW 251/16              CS 4[brewup]                   CS 4[brewup]                66†     n/a
+SPW 251/21              CS 4                           CS 4                        66.1†   n/a
+SPW 251/22              HE7 s7 CS 4[brewup]            HE7 s7 CS 4[brewup]         67      J†
+SPW S307(f)             A4[4] HE9 CS 4                 A4 HE9 CS 4                 67.1    a e
+mSPW S307(f)            no IF IR s5 CS 4               no IF IR s5 CS 4            67.2    a e
+Kfz 13                  CS 2                           CS 2                        68†     n/a
+PSW 221                 sD6 CS 2                       sD6 CS 2                    69†     A† N
+PSW 222                 sD6 CS 3                       sD6 CS 3                    70†     A† N
+PSW 222 (L)             sD6 CS 3                       sD6 CS 3                    70†     A† N<sup>F</sup>
+PSW 231 (6 rad)         CS 4                           CS 4                        71†     n/a
+PSW 231 (8 rad)         sD6 CS 4                       sD6 CS 4                    72†     N
+PSW 232 (8 rad)         sD6 CS 4                       sD6 CS 4                    72      N<sup>F</sup>
+PSW 233                 H8 s9 sD7 CS 5                 H8 s9 sD7 CS 5              73      N<sup>T</sup>
+PSW 234/1               CS 5                           CS 5                        74      A†
+PSW 234/2               A5[3] sD7 CS 4                 A5 sD7 CS 4                 75      n/a
+PSW 234/3               H8 s9 CS 5                     H8 s9 CS 5                  76      Q†
+PSW 234/4               HE7 s7 CS 5[brewup]            HE7 s7 CS 5[brewup]         77†     n/a
+sIG IB                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    78      G
+sIG II                  no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    79      N
+sIG 38(t)M              no IF H6 s9 CS 4[brewup]       no IF H6 s9 CS 4[brewup]    80      E N<sup>FT</sup>
+PzA II                  H5 s8 CS 4                     H5 s8 CS 4                  81      M†
+PzA LrS(f)              no IF H4 s8 CS 4               no IF H4 s8 CS 4            82      a N
+GSW 39H(f)              H4 s7 CS 4                     H4 s7 CS 4                  82.1    a e
+PzA III/IV              no IF H5 s8 CS 6               no IF H5 s8 CS 6            83      n/a
+FlaKPz 38(t)            CS 4                           CS 4                        84      A† E
+37 FlaK/Pz IV           CS 5                           CS 5                        85†     A†
+(Moebelwagen)           CS 6                           CS 6                        85†     A†
+FlaKPz IV/20            CS 6                           CS 6                        86      A†
+FlaKPz IV/37            CS 6                           CS 6                        87      A†
+SdKfz 10/4              CS 5                           CS 5                        88      A† D† N
+SdKfz 10/5              CS 4                           CS 4                        88.1†   A†<sup>2</sup> D†<sup>1</sup>
+SdKfz 6/2               CS 5                           CS 5                        89      A† D† N
+SdKfz 7/1               CS 4                           CS 4                        90      A† D† N
+Kfz 4                   CS 3                           CS 3                        91†     N
+2cm FlaK LKW            CS 5                           CS 5                        92      A†
+3.7cm FlaK LKW          CS 5                           CS 5                        92      A†
+Goliath                                                                            93†     L†
+Kfz 1                   cs 2†                          cs 2†                       94†     L† N
+Kfz 1/20                cs 2                           cs 2                        95†     L†
+Opel 6700 (Blitz)       cs 6                           cs 6                        96      N
+Buessing-NAG 4500       cs 7                           cs 7                        96      N
+SdKfz 2                 cs 2                           cs 2                        97†     L† N
+SdKfz 7                 cs 6                           cs 6                        98      N
+SdKfz 11                cs 5                           cs 5                        99      N
+PzKpfw IA               sD6 CS 2                       sD6 CS 2                    1†      Ge N                               2 TK DR (MG)
+PzKpfw ICV              sD5 CS 3                       sD5 CS 3                    2       A†
+PzKpfw IID              sD6 CS 3                       sD6 CS 3                    3       n/a
+PzKpfw II Bridgelayer   sD6 CS 2                       sD6 CS 2                    4†      n/a
+Pz-7TP                  CS 3                           CS 3                        5       B†
+PSW M35                 CS 5                           CS 5                        6†      n/a                                REV x2
+SdKfz8 FlaK 18          A5[2]4[3] CS 6                 A4 CS 6                     7††[1]  n/a                                CE +3 VCA MA: Rear VCA NA
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
index 84b5343..ed171b2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1940.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1940 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
index 94411f2..bffaeab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1941.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1941 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
index 7a0279f..00fd702 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1942.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1942 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
index d2999c3..66b24ec 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1943.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1943 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
index 0c5bdbe..7162a95 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1944.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1944 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
index 0a977a2..976bf42 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/greek/1945.txt
@@ -1,4 +1,4 @@
 === vehicles/greek/1945 ===
 
-Name    Capabilities    (effective)    #    Notes
-------  --------------  -------------  ---  -------
+Name    Capabilities    (effective)    #    Notes    Comments
+------  --------------  -------------  ---  -------  ----------
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
index 131ac80..2ade5ed 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1940 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
index a09dfa7..c1bfe82 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1941 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
index 64e0022..8fb4d50 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1942 ===
 
-Name              Capabilities                   (effective)          #    Notes
-----------------  -----------------------------  -------------------  ---  --------------
+Name              Capabilities                   (effective)          #    Notes           Comments
+----------------  -----------------------------  -------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                 7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                 8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5             9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
index 2eb012c..cfc9246 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1943 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
index 5c8bb10..850c3f2 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1944 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
index 9467f80..5f019da 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/hungarian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/hungarian/1945 ===
 
-Name              Capabilities                   (effective)             #    Notes
-----------------  -----------------------------  ----------------------  ---  --------------
+Name              Capabilities                   (effective)             #    Notes           Comments
+----------------  -----------------------------  ----------------------  ---  --------------  ----------
 38M Toldi I       CS 3                           CS 3                    7†   A†<sup>1</sup>
 38M Toldi IIA     CS 3                           CS 3                    8†   A†<sup>1</sup>
 40M Turan I(r)    sD5 CS 5                       sD5 CS 5                9†   E N Q
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt
new file mode 100644
index 0000000..698e063
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1940.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1940 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt
new file mode 100644
index 0000000..361141a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1941.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1941 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt
new file mode 100644
index 0000000..46d003f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1942.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1942 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt
new file mode 100644
index 0000000..afaade9
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1943.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1943 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt
new file mode 100644
index 0000000..97f390e
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1944.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1944 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt
new file mode 100644
index 0000000..a7cdbd8
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/indonesian/1945.txt
@@ -0,0 +1,17 @@
+=== vehicles/indonesian/1945 ===
+
+Name                                      Capabilities     (effective)      #       Notes                                Comments
+----------------------------------------  ---------------  ---------------  ------  -----------------------------------  -------------------------------------------------------------------------------------------------------
+Type 94 Light Armoured Vehicle (j)        CS 2             CS 2             1       C Ru M†
+Type 97A Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             2       C
+Type 97B Te-Ke Light Armored Vehicle (j)  CS 2             CS 2             3       C
+Universal Carrier (b)                     CS 3             CS 3             4       C
+Type 95 Ha-Go(j)                          CS 3             CS 3             5       B C D† E†<sup>1</sup>                Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+VCL M1936 (b)                             CS 2             CS 2             6       C
+CTLS-4 (a)                                CS 2             CS 2             7       C Ru M† AllM 26†<sup>1</sup>         Port VCA NA (see Allied Minor Vehicle Note 26).
+Marmon-Herrington III Armored Car (b)     2 TK DR's† CS 4  2 TK DR's† CS 4  8       Ch F†
+M3A1 Scout Car (a)                        9PP CS 4         9PP CS 4         9†      D†<sup>1</sup> AllM 34†<sup>2</sup>  AP TK: use 12.7 column. Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Braat Overvalwagen AA                     CS 4             CS 4             10†[1]  Ch F† AllM AA†<sup>1</sup>           AP TK: use 12.7 column.
+Braat Overvalwagen APC                    12PP CS 5        12PP CS 5        11†[2]  D†<sup>1</sup> Ch F†                 CMG: VCA only Mounted Fire: Full FP
+Alvis-Straussler AC3D                     CS 4             CS 4             12†[1]  D†<sup>2</sup> Ru M†                 AP TK: use 12.7 column.
+PLA Wagen                                 CS 5             CS 5             13†[1]  AllM AA†<sup>1</sup> Ch F†           AP TK: use 12.7 column.
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 1ca9e04..67ae6c1 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1940 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
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 121a31c..6d38592 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1941 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
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 3f90f26..f6a8b62 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1942 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
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 1c7dcbe..618affc 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1943 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
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 d77cb2a..46d45d8 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1944 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
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 19b3154..7a1840c 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
@@ -1,7 +1,7 @@
 === vehicles/italian/1945 ===
 
-Name               Capabilities         (effective)       #    Notes
------------------  -------------------  ----------------  ---  -------------------------------------------------
+Name               Capabilities         (effective)       #    Notes                                              Comments
+-----------------  -------------------  ----------------  ---  -------------------------------------------------  ----------
 L5/21              ® CS 2               ® CS 2            1†   A†<sup>1</sup>
 L5/30              ® CS 2               ® CS 2            1†   n/a
 L3/35              ® CS 2               ® CS 2            2†   A†<sup>1</sup> B†<sup>1</sup> E N R
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
index 23d1ca3..b46cbab 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1940 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
index cc32409..ec9bce3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1941 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
index 2771f65..b4177cd 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1942 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
index 168c6fb..0043aa8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1943 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
index fdd9f14..2c799da 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1944 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
index 364efc0..19eb8d0 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/japanese/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/japanese/1945 ===
 
-Name                                     Capabilities            (effective)             #    Notes
----------------------------------------  ----------------------  ----------------------  ---  -----------------------------
+Name                                     Capabilities            (effective)             #    Notes                                             Comments
+---------------------------------------  ----------------------  ----------------------  ---  ------------------------------------------------  -----------------------------------------------------------------------------------------------------------
 Type 92A                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 92B                                 ® CS 3                  ® CS 3                  1†   A†<sup>1</sup>
 Type 94                                  ® CS 2                  ® CS 2                  2†   n/a
@@ -27,3 +27,29 @@ Type 95                                  cs 2                    cs 2
 Type 94                                  cs 6                    cs 6                    18   n/a
 Type 97                                  cs 7                    cs 7                    18   n/a
 Vickers 8-in. Costal Defense Gun Turret                                                  19†  n/a
+FT-17M Ko(f)                             ® CS 2                  ® CS 2                  1†   A Fr C Ru M†                                      1 MP minimum road movement rate, even if CE.
+FT-17C Ko(f)                             ® CS 2                  ® CS 2                  2†   A B Fr C Ru M†                                    1 MP minimum road movement rate, even if CE.
+NC-27M Otsu(f)                           ® CS 2                  ® CS 2                  3†   A Fr C Ge H†                                      1 MP minimum road movement rate, even if CE.
+NC-27C Otsu(f)                           ® CS 2                  ® CS 2                  4†   A B Fr C Ge H†                                    1 MP minimum road movement rate, even if CE.
+Type 88 LAV(b)                           ® CS 2                  ® CS 2                  5    A AllM D Ch H†
+VCL(b)                                   ® CS 2                  ® CS 2                  6†   A C Ru M†<sup>1</sup>
+Type 98 Ke-Ni                            ® CS 3                  ® CS 3                  7†   Jp C
+Type 2 Ke-To                             ® CS 3                  ® CS 3                  8†   Jp C
+M3(a)                                    ® CS 4                  ® CS 4                  9    A B C Jp A† US B†<sup>1</sup>
+Stuart I(a)                              ® sD4 CS 4              ® sD4 CS 4              10   A B C Jp A†
+Type 97B Shi-Ki                          sD6 CS 4                sD6 CS 4                11†  n/a                                               Moved/Motion: Fire NA
+Type 3 Ka-Chi                            sD5 CS 5                sD5 CS 5                12   Jp 6†                                             Refer to Japanese Note 6 on Pontoons for amphibious data and wreck.
+Type 3 Ka-Chi (without pontoons)         sD5 CS 5                sD5 CS 5                12   Jp 6†
+Armored Eng Veh SS                       ® sD7 CS 5              ® sD7 CS 5              13†  n/a                                               Has 2 side FT with limited traverse. May remove wire as if a Dozer (B24.7).
+Type 2587(b)                             ® 2 TK DR's† CS 5       ® 2 TK DR's† CS 5       14†  Ch F†                                             REV x4
+Marmon-Herrington III(b)                 ® 2 TK DR's† CS 4       ® 2 TK DR's† CS 4       15†  C Ch F†
+Type 1 Ho-Ha                             CS 5                    CS 5                    16†  n/a                                               2MA&amp;2&amp;2
+M3A1 Scout Car(a)                        ® CS 4                  ® CS 4                  17   A C AllM 34†<sup>2</sup> Jp A†<sup>1</sup> Ch F†  Refer to Allied Minor Vehicle Note 34 [EXC: does not come with an inherent HS].
+Carrier A(b)                             ® CS 3                  ® CS 3                  18   A C Br Note 64†                                   The Inherent Crew is a 2-3-7 HS (D6.82). Refer to British Vehicle Note 64 for switching the BMG to an AAMG.
+Type 2 Ho-I                              WP5 sD5 CS 5            WP5 sD5 CS 5            19   n/a
+Type 1 Ho-Ni II                          H5 CS 5                 H5 CS 5                 20†  n/a
+M3 75 SPA(a)                             ® CS 4                  ® CS 4                  21   B C US U Ru M†
+Type 97B Chi-Ha                          H9 CS 4                 H9 CS 4                 22   n/a
+Type 3 Ho-Ni III                         WP5 CS 5                WP5 CS 5                23   n/a
+Type 97 AA Truck                         CS 7                    CS 7                    24†  n/a                                               MA: AA
+Type 98 MCT                              CS 5                    CS 5                    25   Br H Ge A†                                        Bnd FF NA VCA MA: AA (Un)load: Portee
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
index 5639ee6..feea5fe 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1940.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1940 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
index 136caf4..c1d9f95 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1941.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1941 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
index d6cbc9d..0a2c669 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1942.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1942 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
index 27a2801..f4c71bc 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1943.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1943 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
index 9e5338d..1f0631f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1944.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1944 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
index 9e20a34..ffa0eb8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/polish/1945.txt
@@ -1,21 +1,33 @@
 === vehicles/polish/1945 ===
 
-Name               Capabilities    (effective)    #    Notes
------------------  --------------  -------------  ---  ---------------------------------------------
-TKS                ® CS 2          ® CS 2         1†   D
-TKS(L)             ® CS 2          ® CS 2         1†   D
-Vickers Edw(b)     ® CS 3          ® CS 3         2†   A K†<sup>1</sup>
-Vickers Ejw(b)     ® CS 3          ® CS 3         2    A
-7TPdw              ® CS 3          ® CS 3         3†   K†<sup>1</sup>
-7TPjw              CS 3            CS 3           3    n/a
-H35(f)             ® AP10 CS 2     ® AP10 CS 2    4    A E† F
-Peugeot 1918(f)    ® CS 4          ® CS 4         5    A D G†
-wz.29 "Ursus"      ® CS 5          ® CS 5         6†   n/a
-wz.34-I            ® CS 2          ® CS 2         7    n/a
-wz.34-II           ® CS 2          ® CS 2         7    n/a
-De Dion-Bouton(f)  CS 7            CS 7           8†   A Q†<sup>1</sup> AA†<sup>2</sup>
-PF 621L SPAA       CS 5            CS 5           9†   G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
-302T               CS 3            CS 3           10†  n/a
-C2P                cs 4            cs 4           11   n/a
-C4P                cs 5            cs 5           12   n/a
-"Taczanka"         cs 3            cs 3           13†  Q†<sup>1</sup>
+Name               Capabilities       (effective)        #      Notes                                          Comments
+-----------------  -----------------  -----------------  -----  ---------------------------------------------  --------------------
+TKS                ® CS 2             ® CS 2             1†     D
+TKS(L)             ® CS 2             ® CS 2             1†     D
+Vickers Edw(b)     ® CS 3             ® CS 3             2†     A K†<sup>1</sup>
+Vickers Ejw(b)     ® CS 3             ® CS 3             2      A
+7TPdw              ® CS 3             ® CS 3             3†     K†<sup>1</sup>
+7TPjw              CS 3               CS 3               3      n/a
+H35(f)             ® AP10 CS 2        ® AP10 CS 2        4      A E† F
+Peugeot 1918(f)    ® CS 4             ® CS 4             5      A D G†
+wz.29 "Ursus"      ® CS 5             ® CS 5             6†     n/a
+wz.34-I            ® CS 2             ® CS 2             7      n/a
+wz.34-II           ® CS 2             ® CS 2             7      n/a
+De Dion-Bouton(f)  CS 7               CS 7               8†     A Q†<sup>1</sup> AA†<sup>2</sup>
+PF 621L SPAA       CS 5               CS 5               9†     G†<sup>1</sup> Q†<sup>2</sup> AA†<sup>3</sup>
+302T               CS 3               CS 3               10†    n/a
+C2P                cs 4               cs 4               11     n/a
+C4P                cs 5               cs 5               12     n/a
+"Taczanka"         cs 3               cs 3               13†    Q†<sup>1</sup>
+TKS-AA             ® CS 2             ® CS 2             1†[2]  A†<sup>1</sup> C† AllM D
+FT-18C (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  2†     B D†<sup>1</sup> Fr C                          Road Rate NA
+FT-17K (f)         ® AP9 C5†[1] CS 2  ® AP9 C5†[1] CS 2  3†     B D†<sup>1</sup> Fr C                          Road Rate NA +4 ESB
+TKS-D              ® CS 2             ® CS 2             4      C† AllM D                                      12: Immob, 11: Stall
+TKD                ® C5†[1] CS 2      ® C5†[1] CS 2      5†[1]  C† D†<sup>1</sup> AllM D                       12: Immob, 11: Stall
+H39(f)             ® AP10 CS 2        ® AP10 CS 2        6      B Fr A† Fr C
+7TPjw(L)           CS 3               CS 3               7      n/a
+wz. 34 Half Track  cs 6               cs 6               8      n/a
+wz. 34 C4P         cs 5               cs 5               9      n/a
+PF621L             cs 6               cs 6               10     n/a
+PF621L AAtr        CS 6               CS 6               11†    n/a                                            MA: AA
+Praga RV           CS 7               CS 7               12     n/a
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
index 26abfa1..246046f 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1940 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
index 906f8d7..9c9c2f3 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1941 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
index d00e296..c9e2835 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1942 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
index 6d1be7e..2184c89 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1943 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
index dd18194..085c876 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1944 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
index a20f060..6381805 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/romanian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/romanian/1945 ===
 
-Name            Capabilities    (effective)    #    Notes
---------------  --------------  -------------  ---  ------------------
+Name            Capabilities    (effective)    #    Notes               Comments
+--------------  --------------  -------------  ---  ------------------  ----------
 R-1(t)          ® CS 2          ® CS 2         1†   E
 R-35/45(f)      ® CS 2          ® CS 2         2    D
 TACAM T-60(r)   CS 3            CS 3           3†   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
index 306d119..4df26b8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1940.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1940 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® CS 4                   3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† CS 2                  5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†    C† M
-T-34 M43           A4[2] CS 5                                   CS 5                     16†    n/a
-T-43               ®† A4[2] CS 5                                ®† CS 5                  17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   CS 6                     23     D M
-KV-1 M42           A4[2] CS 6                                   CS 6                     23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†    D M
-KV-1S              A4[2] CS 6                                   CS 6                     25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® CS 4                   39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® CS 4                   3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† CS 2                  5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†     C† M
+T-34 M43           A4[2] CS 5                                   CS 5                     16†     n/a
+T-43               ®† A4[2] CS 5                                ®† CS 5                  17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   CS 6                     23      D M
+KV-1 M42           A4[2] CS 6                                   CS 6                     23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†     D M
+KV-1S              A4[2] CS 6                                   CS 6                     25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® CS 4                   39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® C4† CS 4               17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
index d544556..31a21a9 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1941.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1941 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® CS 4                   3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† CS 2                  5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†    C† M
-T-34 M43           A4[2] CS 5                                   CS 5                     16†    n/a
-T-43               ®† A4[2] CS 5                                ®† CS 5                  17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   CS 6                     23     D M
-KV-1 M42           A4[2] CS 6                                   CS 6                     23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†    D M
-KV-1S              A4[2] CS 6                                   CS 6                     25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® CS 4                   39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® CS 4                   3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† CS 2                  5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† CS 5                  14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF AP7 CS 4        15†     C† M
+T-34 M43           A4[2] CS 5                                   CS 5                     16†     n/a
+T-43               ®† A4[2] CS 5                                ®† CS 5                  17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   CS 6                     23      D M
+KV-1 M42           A4[2] CS 6                                   CS 6                     23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               AP7 CS 6                 15†     D M
+KV-1S              A4[2] CS 6                                   CS 6                     25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® CS 4                   39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® CS 5                   44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® C4† CS 4               17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
index 40d4b66..d645e94 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1942.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1942 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               CS 5                     26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†    n/a
-SU-76i(g)          A5[3] CS 5                                   CS 5                     31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               CS 5                     26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           CS 4[brewup]             30†     n/a
+SU-76i(g)          A5[3] CS 5                                   CS 5                     31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            HE7 s7 CS 5              35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               HE7 CS 4                 37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A4 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
index 07397fa..8d0b056 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1943.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1943 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A4 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              sD6† CS 6                18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            s8 sM8 CS 6              19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A4 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  sM8† CS 7                53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
index aa96272..a98d2f8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1944.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1944 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†    N
-T-44               A6[5] CS 5                                   CS 5                     20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  HE8† sD6 sM8† CS 7       53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†     N
+T-44               A6[5] CS 5                                   CS 5                     20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    s8 CS 5[brewup]          50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  HE8† sD6 sM8† CS 7       53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
index f2d5fe1..0e698f7 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/russian/1945.txt
@@ -1,89 +1,107 @@
 === vehicles/russian/1945 ===
 
-Name               Capabilities                                 (effective)              #      Notes
------------------  -------------------------------------------  -----------------------  -----  ---------------------
-T-37               ® CS 2                                       ® CS 2                   1      H† M
-T-27               ® CS 2                                       ® CS 2                   1.1†   M Q
-T-40               ® CS 2                                       ® CS 2                   2†     H†
-T-50               ® A4[2] CS 4                                 ® A4 CS 4                3      n/a
-T-60 M40           ® CS 2                                       ® CS 2                   4      n/a
-T-60 M42           ®† CS 2                                      ®† CS 2                  4      C†
-T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5      C†
-T-26 M33           ® CS 3                                       ® CS 3                   6      D I† M P
-T-26 M37/39        ® CS 3                                       ® CS 3                   6      D M P
-T-26 M31           ® CS 3                                       ® CS 3                   6.1†   M P
-T-26 M32           ® CS 3                                       ® CS 3                   6.2†   M P
-OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†   M P
-ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†   M
-OT-133             ® CS 3                                       ® CS 3                   7†     M P
-BT-2A              ® CS 3                                       ® CS 3                   7.1†   M
-BT-5 M34           ® CS 3                                       ® CS 3                   8†     M P
-BT-7 M37           ® CS 3                                       ® CS 3                   9      D I† M P
-BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10     M P
-T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†    M
-T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†  M
-T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†    M
-T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†  M
-T-34 M40           ® CS 5                                       ® CS 5                   13     M
-T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†    C† M
-OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†    C† M
-T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†    n/a
-T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17     C† M
-T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†    J†
-M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†    N
-T-44               A6[5] CS 5                                   A6 CS 5                  20     B† M
-T-35               ® s9 CS 8                                    ® s9 CS 8                21†    M
-SMK                CS 7                                         CS 7                     21.1   M T†
-T-100              CS 7                                         CS 7                     22.1   M T†
-KV-1 M39/40        CS 6                                         CS 6                     22†    M
-KV-1E              CS 6                                         CS 6                     23     D M
-KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23     D M
-KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†    M
-KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†    D M
-KV-1S              A4[2] CS 6                                   A4 CS 6                  25†    n/a
-KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26     B†
-IS-2               no IF CS 6                                   no IF CS 6               27     B†
-IS-2m              no IF CS 6                                   no IF CS 6               28     B† G†
-IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29     G† J†
-SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†    n/a
-SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31     K
-SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32     n/a
-SU-152             no IF CS 6                                   no IF CS 6               33†    n/a
-ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34     G†
-ISU-152            no IF CS 6                                   no IF CS 6               34     G†
-SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35     n/a
-SU-100             HE7 CS 5                                     HE7 CS 5                 36     n/a
-SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37     K
-BA-20              ® CS 3                                       ® CS 3                   38     n/a
-BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39     n/a
-BA-64B             CS 2                                         CS 2                     40†    A†
-ZSU-37             CS 4                                         CS 4                     41†    A†
-SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42     F†
-GAZ-4M-AA          CS 4                                         CS 4                     43†    A†
-ZIS-42-AA          CS 4                                         CS 4                     44     A† F†
-LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1   n/a
-LANO AA            ® CS 5                                       ® CS 5                   44.2†  A†<sup>1</sup>
-IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45     A† F†
-GAZ-67B            CS 2                                         CS 2                     46     L†
-Komsomolet         CS 2†                                        CS 2†                    46.1†  n/a
-STZ-3              cs 4                                         cs 4                     46.2   n/a
-STZ-5              cs 7                                         cs 7                     46.3   n/a
-GAZ-MM             cs 6                                         cs 6                     47     n/a
-ZIS-5              cs 7                                         cs 7                     47     n/a
-IAG-6              cs 7                                         cs 7                     47     n/a
-NKL-6              CS 2†                                        CS 2†                    47.1†  S†<sup>1</sup>
-NKL-16             cs 2                                         cs 2                     47.1†  S†<sup>1</sup>
-NKL-26             CS 2                                         CS 2                     47.2†  Q S†<sup>1</sup>
-RF-8-GAZ-98        CS 3                                         CS 3                     47.3†  S†<sup>1</sup>
-Stuart III(a)      C6 CS 4                                      C6 CS 4                  48     N O LL
-Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†    B†<sup>1</sup> N O LL
-Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    WP6† s8 CS 5[brewup]     50†    N O R†<sup>1</sup> LL
-Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1   N O R† LL
-Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†    M†<sup>1</sup> N LL
-Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1   N LL
-Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2   N LL
-Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  D7† HE8† sD6 sM8† CS 7   53†    N LL
-M3A1 Scout Car(a)  CS 4                                         CS 4                     54†    N LL
-Jeep GPA(a)        cs 2                                         cs 2                     59     H† L†<sup>1</sup>
-DUKW(a)            cs 7                                         cs 7                     60†    n/a
+Name               Capabilities                                 (effective)              #       Notes                                                     Comments
+-----------------  -------------------------------------------  -----------------------  ------  --------------------------------------------------------  -----------------------------------------
+T-37               ® CS 2                                       ® CS 2                   1       H† M
+T-27               ® CS 2                                       ® CS 2                   1.1†    M Q
+T-40               ® CS 2                                       ® CS 2                   2†      H†
+T-50               ® A4[2] CS 4                                 ® A4 CS 4                3       n/a
+T-60 M40           ® CS 2                                       ® CS 2                   4       n/a
+T-60 M42           ®† CS 2                                      ®† CS 2                  4       C†
+T-70               ®† A4[2] CS 2                                ®† A4 CS 2               5       C†
+T-26 M33           ® CS 3                                       ® CS 3                   6       D I† M P
+T-26 M37/39        ® CS 3                                       ® CS 3                   6       D M P
+T-26 M31           ® CS 3                                       ® CS 3                   6.1†    M P
+T-26 M32           ® CS 3                                       ® CS 3                   6.2†    M P
+OT-26              ® CS 3[brewup]                               ® CS 3[brewup]           6.3†    M P
+ST-26 Bridgelayer  CS 3                                         CS 3                     6.4†    M
+OT-133             ® CS 3                                       ® CS 3                   7†      M P
+BT-2A              ® CS 3                                       ® CS 3                   7.1†    M
+BT-5 M34           ® CS 3                                       ® CS 3                   8†      M P
+BT-7 M37           ® CS 3                                       ® CS 3                   9       D I† M P
+BT-7A              AP7 s9 CS 3                                  AP7 s9 CS 3              10      M P
+T-28 M34           ® s8 CS 5                                    ® s8 CS 5                11†     M
+T-28 M34(L)        ® s8 CS 5                                    ® s8 CS 5                11.1†   M
+T-28E M40          ® s8 CS 6                                    ® s8 CS 6                12†     M
+T-28E M40(L)       ® s8 CS 6                                    ® s8 CS 6                12.1†   M
+T-34 M40           ® CS 5                                       ® CS 5                   13      M
+T-34 M41           ®† A4[2] CS 5                                ®† A4 CS 5               14†     C† M
+OT-34              ®† no IF A2[2] AP7 CS 4                      ®† no IF A2 AP7 CS 4     15†     C† M
+T-34 M43           A4[2] CS 5                                   A4 CS 5                  16†     n/a
+T-43               ®† A4[2] CS 5                                ®† A4 CS 5               17      C† M
+T-34/85            A5[4] sD6† CS 6                              A5 sD6† CS 6             18†     J†
+M4/76(a)           A3[4] s8 sM8 CS 6                            A3 s8 sM8 CS 6           19†     N
+T-44               A6[5] CS 5                                   A6 CS 5                  20      B† M
+T-35               ® s9 CS 8                                    ® s9 CS 8                21†     M
+SMK                CS 7                                         CS 7                     21.1    M T†
+T-100              CS 7                                         CS 7                     22.1    M T†
+KV-1 M39/40        CS 6                                         CS 6                     22†     M
+KV-1E              CS 6                                         CS 6                     23      D M
+KV-1 M41           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-1 M42           A4[2] CS 6                                   A4 CS 6                  23      D M
+KV-2               no IF AP9 CS 7                               no IF AP9 CS 7           24†     M
+KV-8               A4[2] AP7 CS 6                               A4 AP7 CS 6              15†     D M
+KV-1S              A4[2] CS 6                                   A4 CS 6                  25†     n/a
+KV-85              A4[3]5[4] CS 5                               A5 CS 5                  26      B†
+IS-2               no IF CS 6                                   no IF CS 6               27      B†
+IS-2m              no IF CS 6                                   no IF CS 6               28      B† G†
+IS-3               no IF sD6† CS 6                              no IF sD6† CS 6          29      G† J†
+SU-76M             A5[3] CS 4[brewup]                           A5 CS 4[brewup]          30†     n/a
+SU-76i(g)          A5[3] CS 5                                   A5 CS 5                  31      K
+SU-122             no IF H9 s8 CS 5                             no IF H9 s8 CS 5         32      n/a
+SU-152             no IF CS 6                                   no IF CS 6               33†     n/a
+ISU-122            no IF s8 CS 6                                no IF s8 CS 6            34      G†
+ISU-152            no IF CS 6                                   no IF CS 6               34      G†
+SU-85              A5[3] HE7 s7 CS 5                            A5 HE7 s7 CS 5           35      n/a
+SU-100             HE7 CS 5                                     HE7 CS 5                 36      n/a
+SU-57(a)           A5[3] HE7 CS 4                               A5 HE7 CS 4              37      K
+BA-20              ® CS 3                                       ® CS 3                   38      n/a
+BA-6               ® A4[2] CS 4                                 ® A4 CS 4                39      n/a
+BA-64B             CS 2                                         CS 2                     40†     A†
+ZSU-37             CS 4                                         CS 4                     41†     A†
+SU-12              AP7 s8 CS 4                                  AP7 s8 CS 4              42      F†
+GAZ-4M-AA          CS 4                                         CS 4                     43†     A†
+ZIS-42-AA          CS 4                                         CS 4                     44      A† F†
+LANO AT            ® A4[2+] CS 5                                ® A4 CS 5                44.1    n/a
+LANO AA            ® CS 5                                       ® CS 5                   44.2†   A†<sup>1</sup>
+IAG-10-AA          AP7 CS 4                                     AP7 CS 4                 45      A† F†
+GAZ-67B            CS 2                                         CS 2                     46      L†
+Komsomolet         CS 2†                                        CS 2†                    46.1†   n/a
+STZ-3              cs 4                                         cs 4                     46.2    n/a
+STZ-5              cs 7                                         cs 7                     46.3    n/a
+GAZ-MM             cs 6                                         cs 6                     47      n/a
+ZIS-5              cs 7                                         cs 7                     47      n/a
+IAG-6              cs 7                                         cs 7                     47      n/a
+NKL-6              CS 2†                                        CS 2†                    47.1†   S†<sup>1</sup>
+NKL-16             cs 2                                         cs 2                     47.1†   S†<sup>1</sup>
+NKL-26             CS 2                                         CS 2                     47.2†   Q S†<sup>1</sup>
+RF-8-GAZ-98        CS 3                                         CS 3                     47.3†   S†<sup>1</sup>
+Stuart III(a)      C6 CS 4                                      C6 CS 4                  48      N O LL
+Lee(a)             C4† s8† CS 7                                 C4† s8† CS 7             49†     B†<sup>1</sup> N O LL
+Sherman III(a)     WP6[J4+]† s8 CS 5[brewup]                    WP6† s8 CS 5[brewup]     50†     N O R†<sup>1</sup> LL
+Sherman III(L)(a)  WP7 s5 sM8 CS 6[brewup]                      WP7 s5 sM8 CS 6[brewup]  50.1    N O R† LL
+Matilda II(b)      sD6 CS 5                                     sD6 CS 5                 51†     M†<sup>1</sup> N LL
+Valentine V(b)     sM8 CS 4                                     sM8 CS 4                 52.1    N LL
+Valentine VIII(b)  HE7 sD6 CS 4                                 HE7 sD6 CS 4             52.2    N LL
+Churchill III(b)   D6[J4]7[5]† HE7[F3]8[4+]† sD6[4+] sM8† CS 7  D7† HE8† sD6 sM8† CS 7   53†     N LL
+M3A1 Scout Car(a)  CS 4                                         CS 4                     54†     N LL
+Jeep GPA(a)        cs 2                                         cs 2                     59      H† L†<sup>1</sup>
+DUKW(a)            cs 7                                         cs 7                     60†     n/a
+BT-2A              ® C5†[2] CS 3                                ® C5†[2] CS 3            1†      C†<sup>2</sup> Ru M†<sup>1</sup>                          CMG 2:00 from MA
+BT-2A(L)           ® C6†[2] CS 3                                ® C6†[2] CS 3            2†      C†<sup>2</sup> Ru M†<sup>1</sup>
+BT-2B              ® CS 3                                       ® CS 3                   3†      Ru M†<sup>1</sup>                                         2 TK DR (MG)
+OT-26              ® CS 2[brewup]                               ® CS 2[brewup]           4†[1]   Ru M†
+T-26 M31           ® CS 3                                       ® CS 3                   5†      Ru M†<sup>1</sup>
+T-26 M32           ® C5†[2] CS 3                                ® C5†[2] CS 3            6†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U          C5†[2] CS 3                                  C5†[2] CS 3              7†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32(L)        ® C4†[2] CS 3                                ® C4†[2] CS 3            8†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M32U(L)       C4†[2] CS 3                                  C4†[2] CS 3              9†      C†<sup>2</sup> Ru M†<sup>1</sup>                          37*: Stbd MG: Port
+T-26 M33           ® C5 CS 3                                    ® C5 CS 3                10†[3]  Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>                 C4 applies if equipped with optional CMG.
+T-26 M33U          C4†[1] CS 3                                  C4†[1] CS 3              11      C†<sup>1</sup> Ru M†
+T-26 M39U          C4†[1] CS 3                                  C4†[1] CS 3              12      C†<sup>1</sup> Ru M†
+BT-5 M34           ® C4†[2] CS 3                                ® C4†[2] CS 3            13      C†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+BT-7 M37           ® C4†[3] CS 3                                ® C4†[3] CS 3            14      C†<sup>3</sup> Ru D†<sup>2</sup> Ru I† Ru M†<sup>1</sup>
+T-26A              ® AP7 C6†[3] s9 CS 3                         ® AP7 C6†[3] s9 CS 3     15†     B C†<sup>3</sup> Ru D†<sup>2</sup> Ru M†<sup>1</sup>
+BT-7A              AP7 C6†[2] s9 CS 3                           AP7 C6†[2] s9 CS 3       16†     B C†<sup>2</sup> Ru M†<sup>1</sup>
+BA-6               ® A4[2]5[3] C4† CS 4                         ® A5 C4† CS 4            17†     n/a
+SU-12              AP7 C6†[2] s8 CS 4                           AP7 C6†[2] s8 CS 4       18†     B C†<sup>2</sup> Ru F†<sup>1</sup>
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
index aa71e29..04c3bd8 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1940 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
index 71514a2..33c270e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1941 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
index 2ea45ca..14fe081 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1942 ===
 
-Name            Capabilities                       (effective)              #    Notes
---------------  ---------------------------------  -----------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)              #    Notes                              Comments
+--------------  ---------------------------------  -----------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                   17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                   18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                 19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
index ec96104..1d1c69a 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1943 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
index 0dc3199..dcc6442 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1944 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
index 6fa2c09..fe12383 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/slovakian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/slovakian/1945 ===
 
-Name            Capabilities                       (effective)                 #    Notes
---------------  ---------------------------------  --------------------------  ---  ---------------------------------
+Name            Capabilities                       (effective)                 #    Notes                              Comments
+--------------  ---------------------------------  --------------------------  ---  ---------------------------------  ----------
 T vz 33(t)      ® CS 2                             ® CS 2                      17†  K†<sup>1</sup> E F G†<sup>2</sup>
 LT vz 34        ® CS 2                             ® CS 2                      18   n/a
 PzKpfw IIA(g)   sD6 CS 3                           sD6 CS 3                    19   E
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt
new file mode 100644
index 0000000..68286cb
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1940.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1940 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt
new file mode 100644
index 0000000..f5229e7
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1941.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1941 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt
new file mode 100644
index 0000000..1fac15a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1942.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1942 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt
new file mode 100644
index 0000000..177cc74
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1943.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1943 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt
new file mode 100644
index 0000000..4c43c0a
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1944.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1944 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt
new file mode 100644
index 0000000..b46478f
--- /dev/null
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/thai/1945.txt
@@ -0,0 +1,10 @@
+=== vehicles/thai/1945 ===
+
+Name                     Capabilities     (effective)      #    Notes          Comments
+-----------------------  ---------------  ---------------  ---  -------------  -------------------------------------------------------------
+VCL Mk VI(b)             ® CS 2           ® CS 2           1    A Ch H AllM D
+Vickers 6-Ton MkE-B(b)   ® CS 3           ® CS 3           2    A
+Type 83(j)               ® CS 3           ® CS 3           3    A E†           Refer to Japanese Vehicle Note 5 for Rear MG CA restrictions.
+Vickers 6-Ton AA(b)      ® AP TK# 8 CS 3  ® AP TK# 8 CS 3  4    A AllM AA†
+Citroen-Kegresse P17(f)  CS 3             CS 3             5†   A
+Vickers Morris M1930(b)  ® CS 4           ® CS 4           6    Br X† Ch F†    REV x4
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
index 1b168fd..a17fa65 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1940.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1940 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
index 72a41ba..fe38e90 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1941.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1941 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
index ade715c..8c6b085 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1942.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1942 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
index b5d1755..20c708e 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1943.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1943 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
index 3ad9812..45f9583 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1944.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1944 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
index 07a9476..385da00 100644
--- a/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/vo-reports/vehicles/yugoslavian/1945.txt
@@ -1,7 +1,7 @@
 === vehicles/yugoslavian/1945 ===
 
-Name           Capabilities     (effective)      #    Notes
--------------  ---------------  ---------------  ---  ----------------------------------
+Name           Capabilities     (effective)      #    Notes                               Comments
+-------------  ---------------  ---------------  ---  ----------------------------------  ----------
 T-32           ® CS 2           ® CS 2           19   D
 M3A1(a)        C3† CS 4         C3† CS 4         20†  A B C L
 M3A3(a)        C3† sD3 CS 4     C3† sD3 CS 4     20†  A B C L
diff --git a/vasl_templates/webapp/tests/test_capabilities.py b/vasl_templates/webapp/tests/test_capabilities.py
index 5a8f383..d60f23c 100644
--- a/vasl_templates/webapp/tests/test_capabilities.py
+++ b/vasl_templates/webapp/tests/test_capabilities.py
@@ -252,10 +252,10 @@ def test_month_capabilities( webapp, webdriver ):
 
     # Cannone da 47/32: Towed(A1+)†
     ordnance = [ "italian", "ordnance", "Cannone da 47/32" ]
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "12/1940", "NT QSU no Gunshield" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "07/1941", "NT QSU no Gunshield" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "08/1941", "NT QSU no Gunshield Towed[!]" )
-    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1942", "NT QSU no Gunshield Towed[!]" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "12/1940", "NT QSU" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "07/1941", "NT QSU" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "08/1941", "NT QSU Towed[!]" )
+    _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1942", "NT QSU Towed[!]" )
 
     # Cannone da 65/17, 75/27, 75/32 + Obice da 75/18: H6(S2+)†1
     for vo_name in ("Cannone da 65/17", "Cannone da 75/27","Cannone da 75/32","Obice da 75/18"):
@@ -387,6 +387,39 @@ def test_theater_capabilities( webapp, webdriver ):
     _check_capabilities( webdriver, webapp, *ordnance, "ETO", "01/1940", "NT h-d<sup>C</sup>[!] s5" )
     _check_capabilities( webdriver, webapp, *ordnance, "Burma", "01/1940", "NT h-d<sup>C</sup>[!] WP6[!] s5" )
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+@pytest.mark.skipif(
+    pytest.config.option.short_tests, #pylint: disable=no-member
+    reason = "--short-tests specified"
+)
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_theater_capabilities_bfp( webapp, webdriver ):
+    """Test theater-specific capabilities (BFP extension)."""
+
+    # initialize
+    init_webapp( webapp, webdriver,
+        reset = lambda ct: ct.set_vasl_mod( vmod="random", extns_dtype="real" )
+    )
+
+    # LVT(A)1(L): C10(P)†2
+    vehicle = [ "american", "vehicles", "LVT(A)1(L)" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "CS 6" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C10[!2] CS 6" )
+
+    # LVT(A)4(L): C7(P)†3
+    vehicle = [ "american", "vehicles", "LVT(A)4(L)" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "H8 WP9 CS 6" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C7[!3] H8 WP9 CS 6" )
+
+    # M3A1F: C7(P)†
+    vehicle = [ "american", "vehicles", "M3A1F" ]
+    _check_capabilities( webdriver, webapp, *vehicle, "ETO", "01/1940", "CS 4" )
+    _check_capabilities( webdriver, webapp, *vehicle, "PTO", "01/1940", "C7[!] CS 4" )
+
 # ---------------------------------------------------------------------
 
 @pytest.mark.skipif(
@@ -548,6 +581,128 @@ def test_custom_capabilities( webapp, webdriver ): #pylint: disable=too-many-sta
     assert len(saved_scenario["OB_VEHICLES_1"]) == 1
     assert "custom_capabilities" not in saved_scenario["OB_VEHICLES_1"][0]
 
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+def test_custom_comments( webapp, webdriver ): #pylint: disable=too-many-statements
+    """Test custom comments."""
+
+    # NOTE: Vehicle/ordnance comments are not capabilities, but they are managed in the same place
+    # and the code is virtually identical, so it makes sense to put the test code here.
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1 )
+
+    # add a vehicle
+    add_vo( webdriver, "vehicles", 1, "a commented german vehicle" )
+
+    snippet_btn = find_child( "button[data-id='ob_vehicles_1']" )
+    def extract_comments( clipboard ):
+        """Extract the comments."""
+        mo = re.search( r"^- comments: (.*)$", clipboard, re.MULTILINE )
+        return mo.group(1) if mo else ""
+    def check_snippet( expected ):
+        """Check the vehicle's snippet."""
+        snippet_btn.click()
+        wait_for_clipboard( 2, expected, transform=extract_comments )
+    def check_comments_in_dialog( expected ):
+        """Check the vehicle's comments."""
+        elems = find_children( "#vo_comments-sortable li" )
+        elems2 = [ find_child("input[type='text']",c) for c in elems ]
+        assert [ e.get_attribute("value") for e in elems2 ] == expected
+        return elems
+
+    # check the vehicle's snippet
+    check_snippet( '"a comment" "another comment"' )
+
+    # edit the vehicle's comments
+    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = check_comments_in_dialog( [ "a comment", "another comment" ] )
+
+    # edit one of the comments
+    elem = find_child( "input[type='text']", elems[0] )
+    elem.clear()
+    elem.send_keys( "a comment (modified)" )
+
+    # delete a comment
+    ActionChains(webdriver).key_down( Keys.CONTROL ).click( elems[1] ).key_up( Keys.CONTROL ).perform()
+
+    # add a new comment
+    elem = find_child( "#vo_comments-add" )
+    elem.click()
+    elems = find_children( "#vo_comments-sortable input[type='text']" )
+    assert len(elems) == 2
+    elems[1].send_keys( "a <i>new</i> comment" )
+
+    # save the changes and check the vehicle's snippet
+    click_dialog_button( "OK" )
+    check_snippet( '"a comment (modified)" "a <i>new</i> comment"' )
+
+    # save the scenario
+    saved_scenario = save_scenario()
+    assert len(saved_scenario["OB_VEHICLES_1"]) == 1
+    assert saved_scenario["OB_VEHICLES_1"][0]["custom_comments"] == [ "a comment (modified)", "a <i>new</i> comment" ]
+
+    # reload the scenario, and check the vehicle's snippet
+    select_menu_option( "new_scenario" )
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    check_snippet( '"a comment (modified)" "a <i>new</i> comment"' )
+
+    # make sure the comments are loaded correcly when editing the vehicle
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = check_comments_in_dialog( [ "a comment (modified)", "a <i>new</i> comment" ] )
+
+    # delete all comments
+    for elem in elems:
+        ActionChains(webdriver).key_down( Keys.CONTROL ).click( elem ).key_up( Keys.CONTROL ).perform()
+    click_dialog_button( "OK" )
+    check_snippet( "" )
+
+    # save the scenario
+    saved_scenario2 = save_scenario()
+    assert len(saved_scenario2["OB_VEHICLES_1"]) == 1
+    assert saved_scenario2["OB_VEHICLES_1"][0]["custom_comments"] == []
+
+    # reload the scenario, and reset the vehicle's comments back to the default
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    btn = find_child( "#vo_comments-reset" )
+    btn.click()
+    click_dialog_button( "OK" )
+    check_snippet( '"a comment" "another comment"' )
+
+    # make sure the custom comments are no longer saved in the scenario
+    saved_scenario2 = save_scenario()
+    assert len(saved_scenario2["OB_VEHICLES_1"]) == 1
+    assert "custom_comments" not in saved_scenario2["OB_VEHICLES_1"][0]
+
+    # reload the scenario, and manually set the vehicle's comments to be the same as the default
+    load_scenario( saved_scenario )
+    select_tab( "ob1" )
+    elems = find_children( "li", vehicles_sortable )
+    assert len(elems) == 1
+    ActionChains(webdriver).double_click( elems[0] ).perform()
+    elems = find_children( "#vo_comments-sortable input[type='text']" )
+    assert len(elems) == 2
+    elems[0].clear()
+    elems[0].send_keys( "a comment" )
+    elems[1].clear()
+    elems[1].send_keys( "another comment" )
+    click_dialog_button( "OK" )
+
+    # make sure the custom comments are no longer saved in the scenario
+    saved_scenario = save_scenario()
+    assert len(saved_scenario["OB_VEHICLES_1"]) == 1
+    assert "custom_comments" not in saved_scenario["OB_VEHICLES_1"][0]
+
 # ---------------------------------------------------------------------
 
 @pytest.mark.skipif(
diff --git a/vasl_templates/webapp/tests/test_vasl_extensions.py b/vasl_templates/webapp/tests/test_vasl_extensions.py
index 2f24aea..6b7731c 100644
--- a/vasl_templates/webapp/tests/test_vasl_extensions.py
+++ b/vasl_templates/webapp/tests/test_vasl_extensions.py
@@ -3,13 +3,16 @@
 import os
 import zipfile
 import typing
+import re
 
 import pytest
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
 
 from vasl_templates.webapp.utils import TempFile
-from vasl_templates.webapp.tests.utils import init_webapp, set_player, find_child, find_children
+from vasl_templates.webapp.tests.utils import init_webapp, set_player, select_tab, \
+    find_child, find_children, wait_for_clipboard
+from vasl_templates.webapp.tests.test_scenario_persistence import load_scenario
 from vasl_templates.webapp.tests.test_vehicles_ordnance import add_vo
 
 # ---------------------------------------------------------------------
@@ -160,6 +163,141 @@ def test_kgs_extensions( webapp, webdriver ):
 
 # ---------------------------------------------------------------------
 
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_bfp_extensions( webapp, webdriver ):
+    """Test the Bounding Fire extension."""
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
+              .set_vo_notes_dir( dtype="real" )
+    )
+
+    # load the test scenario
+    load_scenario( {
+        "PLAYER_1": "japanese",
+        "OB_VEHICLES_1": [
+            { "name": "Type 97A CHI-HA" }, # nb: this is a normal counter
+            { "name": "M3A1 Scout Car(a)" } # nb: this is a BFP counter
+        ],
+    } )
+    select_tab( "ob1" )
+
+    # test the OB snippet
+    btn = find_child( "button.generate[data-id='ob_vehicles_1']" )
+    btn.click()
+    wait_for_clipboard( 2, re.compile(
+        'Type 97A CHI-HA'
+        '.+<div class="note">'
+        '.+8\u2020, B\u2020<sup>1</sup>, C\u2020<sup>2</sup>'
+        '.+</div>'
+        r'.+M3A1 Scout Car\(a\)'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+17, A, C, AllM 34\u2020<sup>2</sup>, Jp A\u2020<sup>1</sup>, Ch F\u2020'
+        '.+</div>',
+        re.DOTALL
+    ) )
+
+    # test the multi-applicable notes
+    btn = find_child( "button.generate[data-id='ob_vehicles_ma_notes_1']" )
+    btn.click()
+    wait_for_clipboard( 2, [
+        ( False, "B", "sD becomes available" ),
+        ( False, "C", "This tank has no rad" ),
+        ( True, "A", "The (a) indicates U." ),
+        ( True, "C", "Although a captured " ),
+        ( True, "Ch F", "This vehicle, despit" ),
+        ( True, "Jp A", "The MA <i>and all</i" ),
+    ], transform=_extract_extn_ma_notes )
+
+    # test the Chapter H note
+    vehicles_sortable = find_child( "#ob_vehicles-sortable_1" )
+    elems = find_children( "li img.snippet", vehicles_sortable )
+    assert len(elems) == 2
+    elems[0].click()
+    wait_for_clipboard( 2, re.compile( r'<img src=".*?/vehicles/japanese/note/8">' ) )
+    elems[1].click()
+    wait_for_clipboard( 2, re.compile( r'<img src=".*?/vehicles/japanese/note/adf:17">' ) )
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+)
+def test_bfp_extensions2( webapp, webdriver ):
+    """Test the Bounding Fire extension (Operation Cobra counters)."""
+
+    # initialize
+    init_webapp( webapp, webdriver, scenario_persistence=1,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
+              .set_vo_notes_dir( dtype="real" )
+    )
+
+    # load the test scenario
+    load_scenario( {
+        "PLAYER_1": "american",
+        "OB_VEHICLES_1": [
+            { "name": "M5A1" }, # nb: this is a normal counter
+            { "name": "M5A1F" }, # nb: this is the flamethrower version
+            { "name": "M5A1C" }, # nb: this is the Culin version
+        ],
+    } )
+    select_tab( "ob1" )
+
+    # test the OB snippet
+    btn = find_child( "button.generate[data-id='ob_vehicles_1']" )
+    btn.click()
+    wait_for_clipboard( 2, re.compile(
+        r'\bM5A1\b'
+        '.+<div class="note">'
+        '.+5\u2020, C\u2020<sup>2</sup>, F\u2020<sup>1</sup>, G, N, Y'
+        '.+</div>'
+        r'.+\bM5A1F\b'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+5\u2020, US C\u2020<sup>2</sup>, US F\u2020<sup>1</sup>, US G, US N, US Y, C'
+        '.+</div>'
+        r'.+\bM5A1C\b'
+        '.+<div class="note">'
+        '.+&#x2756;'
+        '.+5\u2020, US C\u2020<sup>2</sup>, US F\u2020<sup>1</sup>, US G, US N, US Y, A, B'
+        '.+</div>',
+        re.DOTALL
+    ) )
+
+    # test the multi-applicable notes
+    btn = find_child( "button.generate[data-id='ob_vehicles_ma_notes_1']" )
+    btn.click()
+    wait_for_clipboard( 2, [
+        ( False, "C", "37mm canister has 12" ),
+        ( False, "F", "This AFV may be equi" ),
+        ( False, "G", "May be equipped with" ),
+        ( False, "N", "This vehicle was use" ),
+        ( False, "Y", "If the scenario date" ),
+        ( True, "A", "Use U.S. Vehicle Not" ),
+        ( True, "B", "A vehicle of the sam" ),
+        ( True, "C", "A vehicle of the sam" ),
+        # NOTE: It's less than ideal that we get notes appearing twice (e.g. once as "C and once as "US C"),
+        # but it will only happen if the scenario has different variants of the same counter e.g. a M4A1 and M4A1C,
+        # so we can live with it for now...
+        ( True, "US C", "37mm canister has 12" ),
+        ( True, "US F", "This AFV may be equi" ),
+        ( True, "US G", "May be equipped with" ),
+        ( True, "US N", "This vehicle was use" ),
+        ( True, "US Y", "If the scenario date" ),
+    ], transform=_extract_extn_ma_notes )
+
+# ---------------------------------------------------------------------
+
 def _set_test_vasl_extn( control_tests, build_info, build_info_fname="buildFile" ):
     """Install a test VASL extension file."""
     with TempFile() as temp_file:
@@ -181,3 +319,21 @@ def _check_warning_msgs( control_tests, expected ):
             assert warnings[0].startswith( expected )
     else:
         assert not warnings
+
+def _extract_ma_notes( clipboard ):
+    """Extract the multi-applicable notes from a snippet."""
+    return [
+        mo.group(1).strip()
+        for mo in re.finditer( r'<div class="ma-note">(.*?)</div>', clipboard, re.DOTALL )
+    ]
+
+def _extract_extn_ma_notes( clipboard ): #pylint: disable=missing-docstring
+    """Extract the multi-applicable notes from a snippet, checking for extensions."""
+    ma_notes = _extract_ma_notes( clipboard )
+    # NOTE: We return the first few characters of the multi-applicable note content,
+    # just enough for us to determine whether we're showing the right one or not.
+    for i,ma_note in enumerate(ma_notes):
+        is_extn = "&#x2756;" in ma_note
+        mo = re.search( r"<span class='key'>(.+?):</span>(.*)", ma_note )
+        ma_notes[i] = is_extn, mo.group(1).strip(), mo.group(2).strip()[:20]
+    return ma_notes
diff --git a/vasl_templates/webapp/tests/test_vehicles_ordnance.py b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
index a0bead6..a11ec6e 100644
--- a/vasl_templates/webapp/tests/test_vehicles_ordnance.py
+++ b/vasl_templates/webapp/tests/test_vehicles_ordnance.py
@@ -363,8 +363,15 @@ def test_common_vo( webapp, webdriver ):
         for vo_type in ("vehicles","ordnance"):
 
             # get the vehicles/ordnance
+            last_warning_marker = set_stored_msg_marker( "_last-warning_" )
             elem = find_child( "#ob_{}-add_1".format( vo_type ) )
             elem.click()
+            last_warning = get_stored_msg( "_last-warning_" )
+            if nat in ["thai","indonesian","anzac","burmese","filipino"]: # nb: these are in the BFP extension
+                assert last_warning.startswith( "There are no" )
+                continue
+            else:
+                assert last_warning == last_warning_marker
             vo_entries = find_children( "#select-vo .select2-results li" )
             vo_entries = [ get_vo_entry(e) for e in vo_entries ]
             click_dialog_button( "Cancel" )
diff --git a/vasl_templates/webapp/tests/test_vo_notes.py b/vasl_templates/webapp/tests/test_vo_notes.py
index 50f4509..dc4082a 100644
--- a/vasl_templates/webapp/tests/test_vo_notes.py
+++ b/vasl_templates/webapp/tests/test_vo_notes.py
@@ -366,6 +366,12 @@ def test_special_cases( webapp, webdriver ):
     not pytest.config.option.vo_notes, #pylint: disable=no-member
     reason = "--vo-notes not specified"
 ) #pylint: disable=too-many-locals,too-many-branches
+# NOTE: The expected output files contain pieces from the supported extensions,
+# so the VASL extensions directory must be loaded.
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+    ) #pylint: disable=too-many-locals
 def test_vo_notes_reports( webapp, webdriver ):
     """Check the vehicle/ordnance notes reports."""
 
@@ -375,6 +381,7 @@ def test_vo_notes_reports( webapp, webdriver ):
     init_webapp( webapp, webdriver,
         reset = lambda ct:
             ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" ) \
               .set_vo_notes_dir( dtype="real" )
     )
 
@@ -393,9 +400,10 @@ def test_vo_notes_reports( webapp, webdriver ):
         for vo_type in ["vehicles","ordnance"]:
 
             # get the next report
-            if nat == "landing-craft" and vo_type == "ordnance":
-                continue
             vo_notes, ma_notes, keys = get_vo_notes_report( webapp, webdriver, nat, vo_type )
+            if nat in ("burmese","filipino") or (nat,vo_type) in [("landing-craft","ordnance"),("anzac","ordnance")]:
+                assert not vo_notes and not ma_notes and not keys
+                continue
 
             # convert the report to plain-text
             buf = io.StringIO()
@@ -431,7 +439,7 @@ def test_vo_notes_reports( webapp, webdriver ):
 
             # check the report
             fname = os.path.join( check_dir, fname )
-            assert open(fname,"r",encoding="utf-8").read() == report
+            assert open( fname, "r", encoding="utf-8" ).read() == report
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -467,7 +475,7 @@ def _parse_report( buf ):
         val = val.replace( "&#8804;", "&le;" ).replace( "&#8805;", "&ge;" )
         val = val.replace( "&#176;", "&deg;" )
         val = val.replace( "&#8734;", "&infin;" )
-        val = val.replace( "&#228;", "&auml;" ).replace( "&#235;", "&euml;" )
+        val = val.replace( "&#228;", "&auml;" ).replace( "&#235;", "&euml;" ).replace( "&#252;", "&uml;" )
         val = val.replace( "&#188;", "&frac14;" ).replace( "&#189;", "&frac12;" ).replace( "&#190;", "&frac34;" )
         val = re.sub(
             r"<sup>(.*?)</sup>",
diff --git a/vasl_templates/webapp/tests/test_vo_reports.py b/vasl_templates/webapp/tests/test_vo_reports.py
index a4b94aa..4e2c79e 100644
--- a/vasl_templates/webapp/tests/test_vo_reports.py
+++ b/vasl_templates/webapp/tests/test_vo_reports.py
@@ -5,23 +5,35 @@ import io
 import shutil
 import re
 
+import pytest
 import lxml.html
 import lxml.etree
 import tabulate
 
 import vasl_templates.webapp.tests.utils as test_utils
-from vasl_templates.webapp.tests.utils import get_nationalities, find_child, wait_for
+from vasl_templates.webapp.tests.utils import init_webapp, get_nationalities, find_child, wait_for
 
 # ---------------------------------------------------------------------
 
+# NOTE: The expected output files contain pieces from the supported extensions,
+# so the VASL extensions directory must be loaded.
+@pytest.mark.skipif(
+    not pytest.config.option.vasl_extensions, #pylint: disable=no-member
+    reason = "--vasl-extensions not specified"
+    ) #pylint: disable=too-many-locals
 def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
     """Check the vehicle/ordnance reports."""
 
     # initialize
-    check_dir = os.path.join( os.path.split(__file__)[0], "fixtures/vo-reports/" )
-    save_dir = None # nb: define this to save the generated reports
+    init_webapp( webapp, webdriver,
+        reset = lambda ct:
+            ct.set_data_dir( dtype="real" ) \
+              .set_vasl_mod( vmod="random", extns_dtype="real" )
+    )
 
     # initialize
+    check_dir = os.path.join( os.path.split(__file__)[0], "fixtures/vo-reports/" )
+    save_dir = None # nb: define this to save the generated reports
     if save_dir and os.path.isdir(save_dir):
         shutil.rmtree( save_dir )
 
@@ -45,18 +57,21 @@ def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
 
                 # get the next report
                 results = get_vo_report( webapp, webdriver, vo_type, nat, "ETO", year, 1 )
+                if nat in ("burmese","filipino") or (nat,vo_type) in [("anzac","ordnance")]:
+                    assert not results
+                    continue
 
                 # FUDGE! The "capabilities" and "notes" columns span 2 columns each,
                 # so we add dummy header columns to stop tabulate from getting confused :-/
-                assert results[0][-1] == "Notes"
-                results[0].insert( len(results[0])-1, "#" )
-                assert results[0][-3] == "Capabilities"
-                results[0].insert( len(results[0])-2, "(effective)" )
+                assert results[0][-2] == "Notes"
+                results[0].insert( len(results[0])-2, "#" )
+                assert results[0][-4] == "Capabilities"
+                results[0].insert( len(results[0])-3, "(effective)" )
 
                 # fix up date-based capabilities
-                fixup_capabilities( -4, "Capabilities" )
-                fixup_capabilities( -3, "(effective)" )
-                fixup_capabilities( -2, "#" )
+                fixup_capabilities( -5, "Capabilities" )
+                fixup_capabilities( -4, "(effective)" )
+                fixup_capabilities( -3, "#" )
 
                 # convert the report to plain-text
                 buf = io.StringIO()
@@ -87,10 +102,10 @@ def test_vo_reports( webapp, webdriver ): #pylint: disable=too-many-locals
     results = _parse_report( webdriver.page_source )
 
     # convert the report to plain-text
-    assert results[0][-1] == "Notes"
-    results[0].insert( len(results[0])-1, "#" )
-    assert results[0][-3] == "Capabilities"
-    results[0].insert( len(results[0])-2, "(effective)" )
+    assert results[0][-2] == "Notes"
+    results[0].insert( len(results[0])-2, "#" )
+    assert results[0][-4] == "Capabilities"
+    results[0].insert( len(results[0])-3, "(effective)" )
     buf = io.StringIO()
     print( "=== landing craft ===", file=buf )
     print( "", file=buf )
diff --git a/vasl_templates/webapp/tests/utils.py b/vasl_templates/webapp/tests/utils.py
index 5463e3a..96e13eb 100644
--- a/vasl_templates/webapp/tests/utils.py
+++ b/vasl_templates/webapp/tests/utils.py
@@ -5,6 +5,7 @@ import urllib.request
 import json
 import time
 import re
+import typing
 import uuid
 from collections import defaultdict
 
@@ -503,7 +504,10 @@ def wait_for_clipboard( timeout, expected, contains=None, transform=None ):
         if transform:
             clipboard = transform( clipboard )
         if contains is None:
-            return expected == clipboard
+            if isinstance( expected, typing.re.Pattern ):
+                return expected.search( clipboard ) is not None
+            else:
+                return expected == clipboard
         elif contains is True:
             return expected in clipboard
         elif contains is False:
diff --git a/vasl_templates/webapp/utils.py b/vasl_templates/webapp/utils.py
index b2db34e..11f377c 100644
--- a/vasl_templates/webapp/utils.py
+++ b/vasl_templates/webapp/utils.py
@@ -142,7 +142,7 @@ def is_image_file( fname ):
     if fname.startswith( "." ):
         extn = fname
     else:
-        extn = os.path.splitext( fname )[0]
+        extn = os.path.splitext( fname )[1]
     return extn.lower() in (".png",".jpg",".jpeg",".gif")
 
 def is_empty_file( fname ):
diff --git a/vasl_templates/webapp/vo.py b/vasl_templates/webapp/vo.py
index 91e50df..94eaf60 100644
--- a/vasl_templates/webapp/vo.py
+++ b/vasl_templates/webapp/vo.py
@@ -72,6 +72,8 @@ def _do_get_listings( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     listings["british"].append( lc )
 
     # apply any changes for VASL extensions
+    # NOTE: We do this here, rather than in VaslMod, because VaslMod is a wrapper around a VASL module, and so
+    # only knows about GPID's and counter images, rather than Chapter H pieces and piece ID's (e.g. "ge/v:001").
     vasl_mod = get_vasl_mod()
     if vasl_mod:
         # build an index of the pieces
@@ -81,36 +83,51 @@ def _do_get_listings( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                 piece_index[ piece["id"] ] = piece
         # process each VASL extension
         for extn in vasl_mod.get_extns():
-            if vo_type not in extn[1]:
-                continue
-            _apply_extn_info( extn[0], extn[1], piece_index, vo_type )
+            _apply_extn_info( listings, extn[0], extn[1], piece_index, vo_type )
+
+    # update nationality variants with the listings from their base nationality
+    for nat in listings:
+        if "~" not in nat:
+            continue
+        base_nat = nat.split( "~" )[0]
+        listings[nat] = listings[base_nat] + listings[nat]
 
     return jsonify( listings )
 
-def _apply_extn_info( extn_fname, extn_info, piece_index, vo_type ):
+def _apply_extn_info( listings, extn_fname, extn_info, piece_index, vo_type ):
     """Update the vehicle/ordnance listings for the specified VASL extension."""
 
     # initialize
     logger = logging.getLogger( "vasl_mod" )
-    logger.info( "Updating %s for VASL extension: %s", vo_type, os.path.split(extn_fname)[1] )
+    logger.info( "Updating %s for VASL extension '%s': %s",
+        vo_type, extn_info["extensionId"], os.path.split(extn_fname)[1]
+    )
 
     # process each entry
-    for entry in extn_info[vo_type]:
-        piece = piece_index.get( entry["id"] )
-        if piece:
-            # update an existing piece
-            logger.debug( "- Updating GPID's for %s: %s", entry["id"], entry["gpid"] )
-            if piece["gpid"]:
-                prev_gpids = piece["gpid"]
-                if not isinstance( piece["gpid"], list ):
-                    piece["gpid"] = [ piece["gpid"] ]
-                piece["gpid"].extend( entry["gpid"] )
+    for nat in extn_info:
+        if not isinstance( extn_info[nat], dict ):
+            continue
+        for entry in extn_info[nat].get( vo_type, [] ):
+            piece = piece_index.get( entry["id"] )
+            if piece:
+                # update an existing piece
+                logger.debug( "- Updating GPID's for %s: %s", entry["id"], entry["gpid"] )
+                if piece["gpid"]:
+                    prev_gpids = piece["gpid"]
+                    if not isinstance( piece["gpid"], list ):
+                        piece["gpid"] = [ piece["gpid"] ]
+                    piece["gpid"].extend( entry["gpid"] )
+                else:
+                    prev_gpids = "(none)"
+                    piece["gpid"] = entry["gpid"]
+                logger.debug( "  - %s => %s", prev_gpids, piece["gpid"] )
             else:
-                prev_gpids = "(none)"
-                piece["gpid"] = entry["gpid"]
-            logger.debug( "  - %s => %s", prev_gpids, piece["gpid"] )
-        else:
-            logger.warning( "- Updating V/O entry with extension info not supported: %s", entry["id"] )
+                # add a new piece
+                if nat not in listings:
+                    listings[ nat ] = []
+                entry[ "extn_id" ] = extn_info[ "extensionId" ]
+                listings[ nat ].append( entry )
+
 # ---------------------------------------------------------------------
 
 @app.route( "/<vo_type>/<nat>/<theater>/<int:year>", defaults={"month":1}  )
diff --git a/vasl_templates/webapp/vo_notes.py b/vasl_templates/webapp/vo_notes.py
index 283393f..75810d8 100644
--- a/vasl_templates/webapp/vo_notes.py
+++ b/vasl_templates/webapp/vo_notes.py
@@ -9,6 +9,7 @@ from collections import defaultdict
 from flask import render_template, jsonify, abort
 
 from vasl_templates.webapp import app
+from vasl_templates.webapp.file_server.vasl_mod import get_vasl_mod
 from vasl_templates.webapp.files import FileServer
 from vasl_templates.webapp.utils import resize_image_response, is_image_file, is_empty_file
 
@@ -32,7 +33,7 @@ def get_ordnance_notes():
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branches
+def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-statements,too-many-locals,too-many-branches
     """Load the Chapter H notes."""
 
     # check if we already have the vehicle/ordnance notes
@@ -52,6 +53,13 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
         global _vo_notes_file_server
         _vo_notes_file_server = FileServer( dname )
 
+    # generate a list of extension ID's
+    extn_ids = {}
+    vasl_mod = get_vasl_mod()
+    if vasl_mod:
+        extns = vasl_mod.get_extns()
+        extn_ids = set( e[1]["extensionId"] for e in extns )
+
     def get_ma_note_key( nat, fname ):
         """Get the key for a multi-applicable note."""
         # NOTE: Windows has a case-insensitive file system, so we adopt the following convention:
@@ -69,10 +77,21 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                 fname = fname[0] + fname[1].lower()
             return fname
 
-    # load the vehicle/ordnance notes
+    # initialize
     vo_notes = { "vehicles": defaultdict(dict), "ordnance": defaultdict(dict) }
+    # NOTE: We don't have any data files for these vehicles/ordnance, but they have
+    # multi-applicable notes, so we force them to appear in the final results.
+    vo_notes["vehicles"]["anzac"] = {}
+    vo_notes["ordnance"]["indonesian"] = {}
+
+    # load the vehicle/ordnance notes
     for root,_,fnames in os.walk( dname, followlinks=True ):
         dname2, vo_type2 = os.path.split( root )
+        if vo_type2 in extn_ids:
+            extn_id = vo_type2
+            dname2, vo_type2 = os.path.split( dname2 )
+        else:
+            extn_id = None
         if vo_type2 not in ("vehicles","ordnance","landing-craft"):
             continue
         if os.path.split( dname2 )[1] == "tests":
@@ -94,11 +113,15 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     continue # nb: ignore placeholder files
                 prefix = os.path.commonpath( [ dname, fname ] )
                 if prefix:
+                    if extn_id:
+                        key = "{}:{}".format( extn_id, key )
                     vo_notes[vo_type2][nat2][key] = fname[len(prefix)+1:]
                 else:
                     logging.warning( "Unexpected vehicle/ordnance note path: %s", fname )
             elif extn == ".html":
                 key = get_ma_note_key( nat2, fname )
+                if extn_id:
+                    key = "{}:{}".format( extn_id, key )
                 with open( os.path.join(root,fname), "r" ) as fp:
                     buf = fp.read().strip()
                     if not buf:
@@ -106,7 +129,16 @@ def _do_get_vo_notes( vo_type ): #pylint: disable=too-many-locals,too-many-branc
                     if buf.startswith( "<p>" ):
                         buf = buf[3:].strip()
                     ma_notes[key] = buf
-        vo_notes[vo_type2][nat2]["multi-applicable"] = ma_notes
+        if "multi-applicable" in vo_notes[ vo_type2 ][ nat2 ]:
+            vo_notes[ vo_type2 ][ nat2 ][ "multi-applicable" ].update( ma_notes )
+        else:
+            vo_notes[ vo_type2 ][ nat2 ][ "multi-applicable" ] = ma_notes
+
+    # update nationality variants with the notes from their base nationality
+    for vo_type2 in vo_notes:
+        # FUDGE! The Chinese GMD don't have any vehicles/ordnance of their own, so we have to do this manually.
+        if "chinese" in vo_notes[vo_type2]:
+            vo_notes[vo_type2]["chinese~gmd"] = vo_notes[vo_type2]["chinese"]
 
     with _vo_notes_lock:
         # install the new vehicle/ordnance notes