Index: ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
+++ ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -37,6 +37,7 @@
 			{"nick": "boeseRaupe", "name": "Michael Kluge"},
 			{"nick": "bog_dan_ro", "name": "BogDan Vatra"},
 			{"nick": "Bonk", "name": "Christopher Ebbert"},
+			{"nick": "Boudica"},
 			{"nick": "Caius", "name": "Lars Kemmann"},
 			{"nick": "Calefaction", "name": "Matt Holmes"},
 			{"nick": "Calvinh", "name": "Carl-Johan Höiby"},
Index: ps/trunk/binaries/data/mods/public/gui/session/input.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/input.js
+++ ps/trunk/binaries/data/mods/public/gui/session/input.js
@@ -1696,7 +1696,7 @@
 	if (position)
 		Engine.CameraMoveTo(position.x, position.z);
 	// Move the idle class index to the first class an idle unit was found for.
-	var indexChange = data.idleClasses.findIndex(elem => hasClass(entityState, elem));
+	var indexChange = data.idleClasses.findIndex(elem => MatchesClassList(entityState.identity.classes, elem));
 	currIdleClassIndex = (currIdleClassIndex + indexChange) % classes.length;
 }
 
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js
@@ -159,7 +159,7 @@
 /**
  * Unit classes to be checked for the idle-worker-hotkey.
  */
-var g_WorkerTypes = ["Female", "Trader", "FishingBoat", "CitizenSoldier"];
+var g_WorkerTypes = ["Female+Support", "Trader", "FishingBoat", "CitizenSoldier"];
 /**
  * Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey.
  */
Index: ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -1763,7 +1763,7 @@
 	if(!cmpIdentity)
 		return { "idle": false };
 
-	let bucket = idleClasses.findIndex(elem => cmpIdentity.HasClass(elem));
+	let bucket = idleClasses.findIndex(elem => MatchesClassList(cmpIdentity.GetClassesList(), elem));
 	if (bucket == -1 || excludeUnits.indexOf(unit) > -1)
 		return { "idle": false };