diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index e6d0a2850baad033bf198dfe5c5a1e8fa3e30ae5..e945fa07979657b2d8ca47502f1ccb432ebac1c8 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -91,7 +91,7 @@
 
 <<if $useSlaveListInPageJSNavigation == 1>>
 	<<set _Count = _indexSlavesIdxs.length>>
-	<<if (($Flag == 1) && (_Count > 1) && (_indexed == 0))>>
+	<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
 		<<set _indexed = 1, _counter = 0, _buttons = []>>
 		<style>
 			.hidden {display:none;}
@@ -212,6 +212,7 @@
 	<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
 	<</if>>
 	<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
+	<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 	[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
 
 <<case "Personal Attention Select">>
@@ -276,7 +277,8 @@
 		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
-		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Attendant Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -301,7 +303,8 @@
 		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
-		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Madam Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>