Index: binaries/data/mods/public/simulation/templates/special/generic/mercenary.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/special/generic/mercenary.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <BuildTime op="mul">0.7</BuildTime>
+    <Resources>
+      <food op="mul">0.4</food>
+      <wood>0</wood>
+      <stone>0</stone>
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Loot>
+    <food op="mul">0.4</food>
+    <wood>0</wood>
+    <stone>0</stone>
+  </Loot>
+  <ResourceGatherer disable=""/>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/special/generic/mercenary_cavalry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/special/generic/mercenary_cavalry.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <Resources>
+      <metal>80</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>8</metal>
+  </Loot>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/special/generic/mercenary_elephant.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/special/generic/mercenary_elephant.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <Resources>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>12</metal>
+  </Loot>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/special/generic/mercenary_infantry.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/special/generic/mercenary_infantry.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <Resources>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>6</metal>
+  </Loot>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="special/generic/mercenary_infantry|special/generic/mercenary|template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
       structures/athen/gymnasium
@@ -12,7 +12,6 @@
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/athen_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="special/generic/mercenary_infantry|special/generic/mercenary|template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
       structures/athen/gymnasium
@@ -12,7 +12,6 @@
     <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
Index: source/ps/TemplateLoader.cpp
===================================================================
--- source/ps/TemplateLoader.cpp
+++ source/ps/TemplateLoader.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -62,7 +62,9 @@
 			return false;
 		}
 
-		VfsPath path = VfsPath(TEMPLATE_ROOT) / L"special" / L"filter" / wstring_from_utf8(prefix + ".xml");
+		VfsPath path = VfsPath(TEMPLATE_ROOT) / wstring_from_utf8(prefix + ".xml");
+		if (!VfsFileExists(path))
+			path = VfsPath(TEMPLATE_ROOT) / L"special" / L"filter" / wstring_from_utf8(prefix + ".xml");
 		if (!VfsFileExists(path))
 		{
 			LOGERROR("Invalid subset '%s'", prefix.c_str());