diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 9d89bb6121032bd265042bb9ec5e098749875756..a012fa6ec2645aab189f4b0636155ff7a218c23c 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -4,8 +4,10 @@
 </span>
 
 <<SlaveSort $ClubiIDs>>
-<<set _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, $clubBonuses = 0, $DJRepBonus = 0, $implanted = 0, $legendaryEntertainerID = 0, $modded = 0, $old = 0, $pure = 0, $slim = 0, $stacked = 0, $unmodded = 0, $XX = 0, $XY = 0, $young = 0, _FLsFetish = 0>>
-<<set $legendaryWombID = 0, $pregYes = 0, $pregNo = 0>>
+<<set _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, $clubBonuses = 0, $DJRepBonus = 0, $legendaryEntertainerID = 0, _FLsFetish = 0>>
+<<set $legendaryWombID = 0>>
+
+<<set _clubSlaves = $slaves.filter(function(s) { return s.assignment == "serve in the club" || s.ID == $DJ.ID })>>
 
 <!-- Statistics gathering; income is rep boosts in numbers, and profit will be rep per cash unit, or cash unit per rep -->
 <<set $facility = $facility || {}, $facility.club = initFacilityStatistics($facility.club)>>
@@ -247,7 +249,9 @@
 	<<if ($arcologies[0].FSAssetExpansionist == "unset") && ($arcologies[0].FSSlimnessEnthusiast == "unset")>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsStacked == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($slim > 0) && ($stacked > 0) && (Math.abs($slim-$stacked) <= (_DL/3))>>
+		<<set _slim = slimCount(_clubSlaves)>>
+		<<set _stacked = stackedCount(_clubSlaves)>>
+		<<if (_slim > 0) && (_stacked > 0) && (Math.abs(_slim-_stacked) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		There is a @@.green;wide@@ variety of slim and stacked slaves working the club.
 		<</if>>
@@ -256,7 +260,9 @@
 	<<if ($arcologies[0].FSDegradationist == "unset") && ($arcologies[0].FSBodyPurist == "unset")>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsModded == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($modded > 0) && ($unmodded > 0) && (Math.abs($modded-$unmodded) <= (_DL/3))>>
+		<<set _modded = moddedCount(_clubSlaves)>>
+		<<set _unmodded = unmoddedCount(_clubSlaves)>>
+		<<if (_modded > 0) && (_unmodded > 0) && (Math.abs(_modded-_unmodded) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		There are @@.green;both@@ heavily pierced and tattooed slaves and slaves with more natural bodies filling the club.
 		<</if>>
@@ -265,7 +271,9 @@
 	<<if ($arcologies[0].FSTransformationFetishist == "unset") && ($arcologies[0].FSBodyPurist == "unset")>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsImplanted == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($implanted > 0) && ($pure > 0) && (Math.abs($implanted-$pure) <= (_DL/3))>>
+		<<set _implanted = implantedCount(_clubSlaves)>>
+		<<set _pure = pureCount(_clubSlaves)>>
+		<<if (_implanted > 0) && (_pure > 0) && (Math.abs(_implanted-_pure) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		Citizens in $clubName can easily find @@.yellowgreen;both@@ all-natural girls, and slaves whose beauty has been improved by surgical means.
 		<</if>>
@@ -274,7 +282,9 @@
 	<<if ($seeDicks != 0)>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsXX == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($XX > 0) && ($XY > 0) && (Math.abs($XX-$XY) <= (_DL/3))>>
+		<<set _XX = XXCount(_clubSlaves)>>
+		<<set _XY = XYCount(_clubSlaves)>>
+		<<if (_XX > 0) && (_XY > 0) && (Math.abs(_XX-_XY) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		The club offers a @@.green;mix@@ of sluts that can appeal to varied tastes in genitalia.
 		<</if>>
@@ -283,7 +293,9 @@
 	<<if ($arcologies[0].FSMaturityPreferentialist == "unset") && ($arcologies[0].FSYouthPreferentialist == "unset")>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsOld == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($young > 0) && ($old > 0) && (Math.abs($young-$old) <= (_DL/3))>>
+		<<set _young = youngCount(_clubSlaves)>>
+		<<set _old = oldCount(_clubSlaves)>>
+		<<if (_young > 0) && (_old > 0) && (Math.abs(_young-_old) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		There are girls @@.green;both@@ young and mature in $clubName.
 		<</if>>
@@ -292,7 +304,9 @@
 	<<if ($arcologies[0].FSRepopulationFocus == "unset") && ($arcologies[0].FSRestart == "unset")>>
 	<<if ($clubAdsSpending == 0) || ($clubAdsPreg == 0)>>
 		<<set _possibleBonuses++>>
-		<<if ($pregYes > 0) && ($pregNo > 0) && (Math.abs($pregYes-$pregNo) <= (_DL/3))>>
+		<<set _pregYes = pregYesCount(_clubSlaves)>>
+		<<set _pregNo = pregNoCount(_clubSlaves)>>
+		<<if (_pregYes > 0) && (_pregNo > 0) && (Math.abs(_pregYes-_pregNo) <= (_DL/3))>>
 		<<set $repGain += _DL*random(5,10), $clubBonuses++>>
 		There is a @@.green;wide@@ variety of slaves with swollen, round bellies and flat bellies working the club.
 		<</if>>