Index: binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -52,6 +52,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <GenericName>Bolt Shooter</GenericName>
+    <SelectionGroupName>template_unit_siege_boltshooter</SelectionGroupName>
   </Identity>
   <Loot>
     <xp>200</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -35,6 +35,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
     <GenericName>Battering Ram</GenericName>
+    <SelectionGroupName>template_unit_siege_ram</SelectionGroupName>
   </Identity>
   <Sound>
     <SoundGroups>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -53,6 +53,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged StoneThrower</VisibleClasses>
     <GenericName>Siege Catapult</GenericName>
+    <SelectionGroupName>template_unit_siege_stonethrower</SelectionGroupName>
   </Identity>
   <Loot>
     <xp>300</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -58,6 +58,7 @@
   <Identity>
     <VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
     <GenericName>Siege Tower</GenericName>
+    <SelectionGroupName>template_unit_siege_tower</SelectionGroupName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_packed.xml
@@ -4,6 +4,7 @@
     <Civ>athen</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/athen_siege_lithobolos_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_lithobolos_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/athen_siege_lithobolos_packed">
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/athen_siege_lithobolos_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_packed.xml
@@ -4,6 +4,7 @@
     <Civ>athen</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/athen_siege_oxybeles_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_siege_oxybeles_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/athen_siege_oxybeles_packed">
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/athen_siege_oxybeles_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_packed.xml
@@ -4,6 +4,7 @@
     <Civ>cart</Civ>
     <SpecificName>Ballista</SpecificName>
     <Icon>units/cart_siege_ballista_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/cart_siege_ballista_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_ballista_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/cart_siege_ballista_packed">
   <Identity>
     <Icon>units/cart_siege_ballista.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/cart_siege_ballista_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_packed.xml
@@ -4,6 +4,7 @@
     <Civ>cart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/cart_siege_oxybeles_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/cart_siege_oxybeles_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/cart_siege_oxybeles_packed">
   <Identity>
     <Icon>units/cart_siege_oxybeles.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/cart_siege_oxybeles_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_packed.xml
@@ -4,6 +4,7 @@
     <Civ>mace</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/mace_siege_lithobolos_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_lithobolos_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/mace_siege_lithobolos_packed">
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/mace_siege_lithobolos_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_packed.xml
@@ -4,6 +4,7 @@
     <Civ>mace</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/mace_siege_oxybeles_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/mace_siege_oxybeles_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/mace_siege_oxybeles_packed">
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/mace_siege_oxybeles_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_packed.xml
@@ -4,6 +4,7 @@
     <Civ>ptol</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/ptol_siege_lithobolos_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_lithobolos_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/ptol_siege_lithobolos_packed">
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/ptol_siege_lithobolos_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_packed.xml
@@ -4,6 +4,7 @@
     <Civ>ptol</Civ>
     <SpecificName>Polybolos</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/ptol_siege_polybolos_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_siege_polybolos_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/ptol_siege_polybolos_packed">
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/ptol_siege_polybolos_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_packed.xml
@@ -23,6 +23,7 @@
     <Civ>rome</Civ>
     <SpecificName>Ballista</SpecificName>
     <Icon>units/rome_siege_ballista_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/rome_siege_ballista_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_ballista_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/rome_siege_ballista_packed">
   <Identity>
     <Icon>units/rome_siege_ballista.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/rome_siege_ballista_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_onager.xml
@@ -36,6 +36,7 @@
     <Civ>rome</Civ>
     <SpecificName>Onager</SpecificName>
     <Icon>units/rome_siege_onager.png</Icon>
+    <SelectionGroupName>template_unit_siege_onager</SelectionGroupName>
   </Identity>
   <Pack disable=""/>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_packed.xml
@@ -17,6 +17,7 @@
     <Civ>rome</Civ>
     <SpecificName>Scorpiō</SpecificName>
     <Icon>units/rome_siege_scorpio_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/rome_siege_scorpio_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_siege_scorpio_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/rome_siege_scorpio_packed">
   <Identity>
     <Icon>units/rome_siege_scorpio.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/rome_siege_scorpio_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_packed.xml
@@ -4,6 +4,7 @@
     <Civ>sele</Civ>
     <SpecificName>Lithobólos</SpecificName>
     <Icon>units/hele_siege_lithobolos_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/sele_siege_lithobolos_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/sele_siege_lithobolos_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/sele_siege_lithobolos_packed">
   <Identity>
     <Icon>units/hele_siege_lithobolos.png</Icon>
+    <SelectionGroupName>template_unit_siege_stonethrower_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/sele_siege_lithobolos_packed</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_packed.xml
@@ -4,6 +4,7 @@
     <Civ>spart</Civ>
     <SpecificName>Oxybelḗs</SpecificName>
     <Icon>units/hele_siege_oxybeles_packed.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_packed</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/spart_siege_oxybeles_unpacked</Entity>
Index: binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
+++ binaries/data/mods/public/simulation/templates/units/spart_siege_oxybeles_unpacked.xml
@@ -2,6 +2,7 @@
 <Entity parent="units/spart_siege_oxybeles_packed">
   <Identity>
     <Icon>units/hele_siege_oxybeles.png</Icon>
+    <SelectionGroupName>template_unit_siege_boltshooter_unpacked</SelectionGroupName>
   </Identity>
   <Pack>
     <Entity>units/spart_siege_oxybeles_packed</Entity>