Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -36,6 +36,7 @@
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
+    <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -28,6 +28,7 @@
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Merchantman</GenericName>
+    <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -52,6 +52,7 @@
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <GenericName>Female Citizen</GenericName>
+    <SelectionGroupName>template_unit_support_female_citizen</SelectionGroupName>
     <Phenotype>female</Phenotype>
     <Formations disable=""/>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -24,6 +24,7 @@
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
+    <SelectionGroupName>template_unit_support_healer</SelectionGroupName>
     <Rank>Basic</Rank>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Heal units.</Tooltip>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -38,6 +38,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
+    <SelectionGroupName>template_unit_support_slave</SelectionGroupName>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -14,6 +14,7 @@
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <GenericName>Trader</GenericName>
+    <SelectionGroupName>template_unit_support_trader</SelectionGroupName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
     <Formations disable=""/>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Gýnē Athēnaía</SpecificName>
     <GenericName>Athenian Woman</GenericName>
     <Icon>units/hele_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/athen_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_support_healer_b.xml
@@ -3,7 +3,6 @@
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/athen_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen.xml
@@ -10,7 +10,6 @@
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/brit_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_support_healer_b.xml
@@ -2,11 +2,9 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>brit</Civ>
-    <SelectionGroupName>units/brit_support_healer_b</SelectionGroupName>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
     <Icon>units/celt_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/brit_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Aštāh</SpecificName>
     <GenericName>Carthaginian Woman</GenericName>
     <Icon>units/cart_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/cart_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/carthaginians/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_support_healer_b.xml
@@ -3,10 +3,8 @@
   <Identity>
     <Civ>cart</Civ>
     <Phenotype>female</Phenotype>
-    <SelectionGroupName>units/cart_support_healer_b</SelectionGroupName>
     <SpecificName>Kehinit</SpecificName>
     <Icon>units/cart_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/cart_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen.xml
@@ -10,7 +10,6 @@
     <GenericName>Celtic Woman</GenericName>
     <SpecificName>Bena</SpecificName>
     <Icon>units/celt_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/gaul_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/celts/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_support_healer_b.xml
@@ -2,11 +2,9 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>gaul</Civ>
-    <SelectionGroupName>units/gaul_support_healer_b</SelectionGroupName>
     <GenericName>Druid</GenericName>
     <SpecificName>Druid</SpecificName>
     <Icon>units/celt_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/gaul_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Emazteki</SpecificName>
     <GenericName>Iberian Woman</GenericName>
     <Icon>units/iber_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/iber_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_support_healer_b.xml
@@ -3,11 +3,9 @@
   <Identity>
     <Civ>iber</Civ>
     <Phenotype>female</Phenotype>
-    <SelectionGroupName>units/iber_support_healer_b</SelectionGroupName>
     <GenericName>Priestess of Ataekina</GenericName>
     <SpecificName>Emakumezko Apaiz de Ataekina</SpecificName>
     <Icon>units/iber_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/iber_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Shmt</SpecificName>
     <GenericName>Kushite Woman</GenericName>
     <Icon>units/kush_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/kush_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/kushites/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_healer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>kush</Civ>
-    <SelectionGroupName>units/kush_support_healer_b</SelectionGroupName>
     <GenericName>Priest</GenericName>
     <SpecificName>wʿb nsw</SpecificName>
     <Icon>units/kush_support_healer.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Gýnē Makedonikḗ</SpecificName>
     <GenericName>Macedonian Woman</GenericName>
     <Icon>units/hele_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/mace_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_support_healer_b.xml
@@ -3,7 +3,6 @@
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/mace_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Naari</SpecificName>
     <GenericName>Indian Woman</GenericName>
     <Icon>units/maur_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/maur_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_support_healer_b.xml
@@ -2,11 +2,9 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>maur</Civ>
-    <SelectionGroupName>units/maur_support_healer_b</SelectionGroupName>
     <GenericName>Brahmin Priest</GenericName>
     <SpecificName>Brāhmaṇa Pujari</SpecificName>
     <Icon>units/maur_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/maur_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen.xml
@@ -6,7 +6,6 @@
     <SpecificName>Banu Miyanrudani</SpecificName>
     <GenericName>Mesopotamian Woman</GenericName>
     <Icon>units/pers_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/pers_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/persians/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_support_healer_b.xml
@@ -3,11 +3,9 @@
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
-    <SelectionGroupName>units/pers_support_healer_b</SelectionGroupName>
     <GenericName>Median Magus</GenericName>
     <SpecificName>Maguš Māda</SpecificName>
     <Icon>units/pers_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/pers_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen.xml
@@ -5,7 +5,6 @@
     <SpecificName>Gýnē Aigýptia</SpecificName>
     <GenericName>Egyptian Woman</GenericName>
     <Icon>units/ptol_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/ptol_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol_support_healer_b.xml
@@ -2,7 +2,6 @@
 <Entity parent="template_unit_support_healer">
   <Identity>
     <Civ>ptol</Civ>
-    <SelectionGroupName>units/ptol_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/ptol_support_healer.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen.xml
@@ -6,7 +6,6 @@
     <SpecificName>Rōmāna</SpecificName>
     <GenericName>Roman Woman</GenericName>
     <Icon>units/rome_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/rome_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/romans/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_support_healer_b.xml
@@ -3,11 +3,9 @@
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
-    <SelectionGroupName>units/rome_support_healer_b</SelectionGroupName>
     <GenericName>Doctor</GenericName>
     <SpecificName>Medicus</SpecificName>
     <Icon>units/rome_support_healer.png</Icon>
-    <Rank>Basic</Rank>
   </Identity>
   <Promotion>
     <Entity>units/rome_support_healer_a</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen.xml
@@ -6,7 +6,6 @@
     <SpecificName>Syrías Gýnē</SpecificName>
     <GenericName>Syrian Woman</GenericName>
     <Icon>units/sele_support_female.png</Icon>
-    <SelectionGroupName>units/sele_support_female_citizen</SelectionGroupName>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/female_citizen.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_support_healer_b.xml
@@ -3,7 +3,6 @@
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/sele_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen.xml
@@ -23,7 +23,6 @@
     <GenericName>Spartan Woman</GenericName>
     <SpecificName>Spartiâtis</SpecificName>
     <Icon>units/spart_support_female_citizen.png</Icon>
-    <SelectionGroupName>units/spart_support_female_citizen</SelectionGroupName>
   </Identity>
   <UnitAI>
     <CanPatrol>true</CanPatrol>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_support_healer_b.xml
@@ -3,7 +3,6 @@
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
-    <SelectionGroupName>units/spart_support_healer_b</SelectionGroupName>
     <GenericName>Surgeon</GenericName>
     <SpecificName>Iatros</SpecificName>
     <Icon>units/hele_support_healer.png</Icon>