diff --git a/src/facilities/farmyard/farmerSelect.tw b/src/facilities/farmyard/farmerSelect.tw
index aa3f1cdd49ce026b6b7f254e3f951e924113442f..e94fb005024f84ead1a820fcc4e6bf75d210d905 100644
--- a/src/facilities/farmyard/farmerSelect.tw
+++ b/src/facilities/farmyard/farmerSelect.tw
@@ -1,4 +1,4 @@
-:: Farmer Select [nobr]
+:: Farmer Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Farmyard", $encyclopedia = "Farmer">>
 <<if ($Farmer != 0)>>
diff --git a/src/facilities/nursery/matronSelect.tw b/src/facilities/nursery/matronSelect.tw
index c761b76cc31d00777a3a899f1b74aa96f235586b..334c05b7a2356cc2b7173502765c72563b0f40e1 100644
--- a/src/facilities/nursery/matronSelect.tw
+++ b/src/facilities/nursery/matronSelect.tw
@@ -1,4 +1,4 @@
-:: Matron Select [nobr]
+:: Matron Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Nursery", $encyclopedia = "Matron">>
 <<if ($Matron != 0)>>
diff --git a/src/npc/agent/agentSelect.tw b/src/npc/agent/agentSelect.tw
index 4b66d67ac2881b8a2cc8de545b5902ccc3d1b462..147416474dbbb8ae100fc6168f18b47cb21a9610 100644
--- a/src/npc/agent/agentSelect.tw
+++ b/src/npc/agent/agentSelect.tw
@@ -1,11 +1,11 @@
-:: Agent Select [nobr]
+:: Agent Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Neighbor Interact", $encyclopedia = "Agents">>
 ''Appoint an Agent from your devoted slaves:''
 
 <<= App.UI.SlaveList.slaveSelectionList(
-		s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0 || State.variables.eugenicsFullControl === 1 || State.variables.arcologies[0].FSRestart === "unset")),
-		(slave, index) => App.UI.DOM.passageLink(SlaveFullName(slave), 'Agent Workaround',
-			() => { variables().i = index; }),
+		s => (s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset")),
+		(slave) => App.UI.DOM.passageLink(SlaveFullName(slave), 'Agent Workaround',
+			() => { V.i = V.slaves.findIndex((s) => s.ID === slave.ID); }),
 		s => App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)
 	)>>
diff --git a/src/npc/agent/agentWorkaround.tw b/src/npc/agent/agentWorkaround.tw
index 47b08f4975ac1f709d496790a44f474bffa3fef6..9a0412913bca906d783ad0181089556796fd90ba 100644
--- a/src/npc/agent/agentWorkaround.tw
+++ b/src/npc/agent/agentWorkaround.tw
@@ -1,4 +1,4 @@
-:: Agent Workaround [nobr]
+:: Agent Workaround [nobr jump-from-safe]
 
 <<set $nextButton = "Continue", $nextLink = "Neighbor Interact">>
 
diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw
index f2a58e2d5de63835c09379988522a555972cd2ec..f6d21e712e56d517ca691d222711b4910f324853 100644
--- a/src/uncategorized/attendantSelect.tw
+++ b/src/uncategorized/attendantSelect.tw
@@ -1,4 +1,4 @@
-:: Attendant Select [nobr]
+:: Attendant Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Spa", $encyclopedia = "Attendant">>
 <<if _S.Attendant>>
diff --git a/src/uncategorized/concubineSelect.tw b/src/uncategorized/concubineSelect.tw
index 6dc78c2a7c571b8801e3966acf399d43f7887c2f..4911d97db586459cde01553710fb136f056b8d79 100644
--- a/src/uncategorized/concubineSelect.tw
+++ b/src/uncategorized/concubineSelect.tw
@@ -1,4 +1,4 @@
-:: Concubine Select [nobr]
+:: Concubine Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Master Suite", $encyclopedia = "Concubine">>
 <<if ($Concubine != 0)>>
diff --git a/src/uncategorized/djSelect.tw b/src/uncategorized/djSelect.tw
index 0f8ce2b700bb654980e89b47b360285d697105be..b96cb766b59193f820975a399f5de8e61732fc3f 100644
--- a/src/uncategorized/djSelect.tw
+++ b/src/uncategorized/djSelect.tw
@@ -1,4 +1,4 @@
-:: DJ Select [nobr]
+:: DJ Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Club", $encyclopedia = "DJ">>
 <<if ($DJ != 0)>>
diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw
index da0f7201f29841d922769f4402fc9da3adfc7df4..9ba7e7ef90caad2c2c5639db5311ac5f88ac46b2 100644
--- a/src/uncategorized/madamSelect.tw
+++ b/src/uncategorized/madamSelect.tw
@@ -1,4 +1,4 @@
-:: Madam Select [nobr]
+:: Madam Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Brothel", $encyclopedia = "Madam">>
 <<if ($Madam != 0)>>
diff --git a/src/uncategorized/milkmaidSelect.tw b/src/uncategorized/milkmaidSelect.tw
index 0422098d463f8f07a09f527bf1a0878c891c5d2c..f10c82b5ebef70ec58b1089db42709376ddff0a7 100644
--- a/src/uncategorized/milkmaidSelect.tw
+++ b/src/uncategorized/milkmaidSelect.tw
@@ -1,4 +1,4 @@
-:: Milkmaid Select [nobr]
+:: Milkmaid Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Dairy", $encyclopedia = "Milkmaid">>
 <<if ($Milkmaid != 0)>>
diff --git a/src/uncategorized/nurseSelect.tw b/src/uncategorized/nurseSelect.tw
index e5e92cd225fedb325be4705d88e5eeb0c9788db1..debce7c0d981fe95efba21d0ba0805323ceb237b 100644
--- a/src/uncategorized/nurseSelect.tw
+++ b/src/uncategorized/nurseSelect.tw
@@ -1,4 +1,4 @@
-:: Nurse Select [nobr]
+:: Nurse Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Clinic", $encyclopedia = "Nurse">>
 <<if ($Nurse != 0)>>
diff --git a/src/uncategorized/schoolteacherSelect.tw b/src/uncategorized/schoolteacherSelect.tw
index 904b0599509a28a16897ccfc885c053a8e8b210a..43cb233361149a1d9d5db3b098661e99afde3b0e 100644
--- a/src/uncategorized/schoolteacherSelect.tw
+++ b/src/uncategorized/schoolteacherSelect.tw
@@ -1,4 +1,4 @@
-:: Schoolteacher Select [nobr]
+:: Schoolteacher Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Schoolroom", $encyclopedia = "Schoolteacher">>
 <<if ($Schoolteacher != 0)>>
diff --git a/src/uncategorized/stewardessSelect.tw b/src/uncategorized/stewardessSelect.tw
index 112c0ed0da9dcac90c240592120d0f06c6b8012b..8ea988a80db05d4de778ff68be0c637e8c317a5f 100644
--- a/src/uncategorized/stewardessSelect.tw
+++ b/src/uncategorized/stewardessSelect.tw
@@ -1,4 +1,4 @@
-:: Stewardess Select [nobr]
+:: Stewardess Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Servants' Quarters", $encyclopedia = "Stewardess">>
 <<if ($Stewardess != 0)>>
diff --git a/src/uncategorized/subordinateTargeting.tw b/src/uncategorized/subordinateTargeting.tw
index ccd8f8edf27d26aaddde165af2d8c57162960bdb..3f47d39320546204e76528875c86b8cdfb737757 100644
--- a/src/uncategorized/subordinateTargeting.tw
+++ b/src/uncategorized/subordinateTargeting.tw
@@ -31,7 +31,7 @@
 	<<= App.UI.SlaveList.slaveSelectionList(
 			s => s.devotion >= -20 && s.fuckdoll === 0 && State.variables.activeSlave.ID !== s.ID &&
 				(!isAmputee(State.variables.activeSlave) || !isAmputee(s)),
-			(s, i) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { V.activeSlave.subTarget = s.ID; }),
+			(s) => App.UI.DOM.passageLink(SlaveFullName(s), 'Subordinate Targeting', () => { V.activeSlave.subTarget = s.ID; }),
 		)>>
 	<<if $universalRulesImpregnation == "Stud" && $StudID == 0>>
 		<br><br>[[Stud|Subordinate Targeting][$activeSlave.subTarget = -1, $StudID = $activeSlave.ID]]
diff --git a/src/uncategorized/wardenessSelect.tw b/src/uncategorized/wardenessSelect.tw
index 5473502a82e844a89e2c8902f65315ece0ccd4a3..7180dd34750985c253a84ad2a2dcd41b42c5420d 100644
--- a/src/uncategorized/wardenessSelect.tw
+++ b/src/uncategorized/wardenessSelect.tw
@@ -1,4 +1,4 @@
-:: Wardeness Select [nobr]
+:: Wardeness Select [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Cellblock", $encyclopedia = "Wardeness">>
 <<if ($Wardeness != 0)>>