diff --git a/src/ContributionScores.php b/src/ContributionScores.php
index 1c618b1..6d5683f 100644
--- a/src/ContributionScores.php
+++ b/src/ContributionScores.php
@@ -121,21 +121,7 @@ class ContributionScores extends IncludableSpecialPage {
 
 		if ( $wgContribScoreIgnoreBlockedUsers ) {
 			$sqlWhere[] = "{$revUser} NOT IN " .
-				$dbr->buildSelectSubquery( 				[
-						'block',
-						'block_target'
-					],
-					'bt_user',
-					'bt_user <> 0',
-					__METHOD__,
-					[],
-					[
-						'block_target' => [ 'JOIN', [
-							'bl_target=bt_id'
-						] ]
-					]
-				);
-
+				$dbr->buildSelectSubquery( 'ipblocks', 'ipb_user', 'ipb_user <> 0', __METHOD__ );
 		}
 
 		if ( $wgContribScoreIgnoreBots ) {
@@ -201,6 +187,7 @@ class ContributionScores extends IncludableSpecialPage {
 			__METHOD__,
 			[
 				'ORDER BY' => 'wiki_rank DESC',
+				'GROUP BY' => 'user_name',
 				'LIMIT' => $limit,
 			],
 			[