Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -63,7 +63,7 @@
 	</object>
 
 	<object hotkey="selection.idleunit">
-		<action on="KeyDown">findIdleUnit(["!Domestic"]);</action>
+		<action on="KeyDown">findIdleUnit(["!Domestic+!Formation"]);</action>
 	</object>
 
 	<object hotkey="selection.cancel">
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -29,6 +29,7 @@
   </FormationAttack>
   <Identity>
     <Civ/> <!-- Unused -->
+    <Classes datatype="tokens">Formation</Classes>
     <Undeletable>true</Undeletable>
   </Identity>
   <Obstruction>