diff --git a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json
index 39600d0..259807b 100644
--- a/vasl_templates/webapp/data/default-template-pack/national-capabilities.json
+++ b/vasl_templates/webapp/data/default-template-pack/national-capabilities.json
@@ -173,11 +173,16 @@
     "grenades": "Smoke",
     "notes": [
         "Escape NA",
-        "{? 03/1944- | Inherent PF in non-Crew MMC (Romanian<sup>3/44+</sup>; Hungarian<sup>6/44+</sup>) | No Inherent PF | Inherent PF (Romanian<sup>3/44+</sup>; Hungarian<sup>6/44+</sup>) ?}",
-        "{? 07/1943- | Inherent ATMM in Romanian non-Crew Elite &amp; 1st Line MMC (-2 CC DRM) | No Inherent ATMM | Inherent ATMM<sup>(7/43+)</sup> ?}",
         { "caption": "1st Line &amp; Conscript", "notes": [
             "1 PAATC",
             "Surrender on HoB Final DR &ge; 10"
+        ] },
+        { "caption": "Romanian, Hungarian", "notes": [
+            "{! -02/1944 = No Inherent PF | 03/1944-05/1944 = | 06/1944- = Inherent PF in non-Crew MMC | Inherent PF <span class='comment'>(Romanian<sup>3/44+</sup>, Hungarian<sup>6/44+</sup>)</span> !}"
+        ] },
+        { "caption": "Romanian", "notes": [
+            "{! 03/1944-05/1944 = Inherent PF  in non-Crew MMC !}",
+            "{? 07/1943- | Inherent ATMM in non-Crew Elite <br> and 1st Line MMC (-2 CC DRM) | No Inherent ATMM | Inherent ATMM<sup>(7/43+)</sup> ?}"
         ] }
     ]
 },
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1940.txt
index 487d107..d8fa81b 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1940.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1941.txt
index 4f1239a..c5c44cb 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1941.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1942.txt
index 1599759..9b5191d 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1942.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1943.txt
index de707f9..46f88f4 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1943.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1944.txt
index 58083db..00ef419 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1944.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1945.txt
index 60596d3..3901f21 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/bulgarian/1945.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* Inherent PF in non-Crew MMC (Romanian3/44+; Hungarian6/44+)
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* Inherent PF in non-Crew MMC
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1940.txt
index fd02b7a..8a01ea8 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1940.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1941.txt
index 21e8624..04ef78e 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1941.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1942.txt
index 4b88b4c..15ade7b 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1942.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1943.txt
index dead12a..d19fd6f 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1943.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1944.txt
index d3f87e2..2f52ae7 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1944.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1945.txt
index 4e793ec..e699789 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/croatian/1945.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* Inherent PF in non-Crew MMC (Romanian3/44+; Hungarian6/44+)
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* Inherent PF in non-Crew MMC
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1940.txt
index a519e09..5e5972b 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1940.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1941.txt
index 43d7f9c..57b6475 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1941.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1942.txt
index 57d4c49..b4220ce 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1942.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1943.txt
index 7fe8740..c97cff8 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1943.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1944.txt
index b32a667..ac00393 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1944.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1945.txt
index d410a11..0e19806 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/hungarian/1945.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* Inherent PF in non-Crew MMC (Romanian3/44+; Hungarian6/44+)
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* Inherent PF in non-Crew MMC
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1940.txt
index 1b1285f..d3fdf28 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1940.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1941.txt
index f1eb4cb..2cfcb3a 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1941.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1942.txt
index ea50545..3b905b8 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1942.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1943.txt
index 627dc5e..f3c2463 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1943.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1944.txt
index 17b0a5b..721e0e1 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1944.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1945.txt
index 1a40131..91fe2c9 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/romanian/1945.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* Inherent PF in non-Crew MMC (Romanian3/44+; Hungarian6/44+)
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* Inherent PF in non-Crew MMC
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1940.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1940.txt
index 4c4a079..0951cf5 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1940.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1940.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1941.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1941.txt
index b6e9c74..fba9220 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1941.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1941.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1942.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1942.txt
index 489c9c7..e649412 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1942.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1942.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1943.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1943.txt
index 36f413a..2ef9884 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1943.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1943.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* No Inherent ATMM
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* No Inherent ATMM
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1944.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1944.txt
index a4d46ae..aeb34bc 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1944.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1944.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* No Inherent PF
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* No Inherent PF
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1945.txt b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1945.txt
index 3ced1ca..8e741e9 100644
--- a/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1945.txt
+++ b/vasl_templates/webapp/tests/fixtures/nat-caps/slovakian/1945.txt
@@ -6,9 +6,13 @@ Red TH#
 OBA: 6B 3R (access: ≤ 1)
 
 * Escape NA
-* Inherent PF in non-Crew MMC (Romanian3/44+; Hungarian6/44+)
-* Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)
 
 1st Line & Conscript:
 * 1 PAATC
 * Surrender on HoB Final DR ≥ 10
+
+Romanian, Hungarian:
+* Inherent PF in non-Crew MMC
+
+Romanian:
+* Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)
diff --git a/vasl_templates/webapp/tests/test_national_capabilities.py b/vasl_templates/webapp/tests/test_national_capabilities.py
index acd9c95..4c1be24 100644
--- a/vasl_templates/webapp/tests/test_national_capabilities.py
+++ b/vasl_templates/webapp/tests/test_national_capabilities.py
@@ -268,17 +268,20 @@ def test_time_based_national_capabilities( webapp, webdriver ):
     check_oba( "finnish", "ETO", 1, 1945, "7B", "3R", plentiful=True )
 
     # test the Axis Minor national capabilities
-    check_notes( "romanian", "ETO", 12, 1942, [
-        "No Inherent ATMM"
-    ] )
     check_notes( "romanian", "ETO", 6, 1943, [
-        "No Inherent ATMM"
+        "No Inherent PF", "No Inherent ATMM"
     ] )
     check_notes( "romanian", "ETO", 7, 1943, [
-        "Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)"
+        "No Inherent PF", "Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)"
+    ] )
+    check_notes( "romanian", "ETO", 3, 1944, [
+        "Inherent PF  in non-Crew MMC", "Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)"
     ] )
-    check_notes( "romanian", "ETO", 1, 1944, [
-        "Inherent ATMM in Romanian non-Crew Elite & 1st Line MMC (-2 CC DRM)"
+    # FUDGE! Because the "Inherent PF" note appears in the "Romanian + Hungarian" or "Romanian" group,
+    # depending on the data, we distinguish between the two by having an extra space in the note,
+    # which won't make any different when it's rendered as HTML, but can be detected here... :-/
+    check_notes( "romanian", "ETO", 7, 1944, [
+        "Inherent PF in non-Crew MMC", "Inherent ATMM in non-Crew Elite  and 1st Line MMC (-2 CC DRM)"
     ] )
 
     # test the KFW American national Capabilities