diff --git a/app/Models/Torrent.php b/app/Models/Torrent.php
index 9e3dadce..88e1dc22 100644
--- a/app/Models/Torrent.php
+++ b/app/Models/Torrent.php
@@ -179,7 +179,7 @@ class Torrent extends NexusModel
             throw new \RuntimeException('no select sp_state field');
         }
         $spState = $this->sp_state;
-        $global = self::getGlobalPromotionState();
+        $global = get_global_sp_state();
         $log = sprintf('torrent: %s sp_state: %s, global sp state: %s', $this->id, $spState, $global);
         if ($global != self::PROMOTION_NORMAL) {
             $spState = $global;
@@ -214,18 +214,6 @@ class Torrent extends NexusModel
         );
     }
 
-    public static function getGlobalPromotionState()
-    {
-        if (is_null(self::$globalPromotionState)) {
-            $result = TorrentState::query()->first(['global_sp_state']);
-            if (!$result) {
-                do_log("global sp state no value", 'error');
-            }
-            self::$globalPromotionState = $result->global_sp_state ?? false;
-        }
-        return self::$globalPromotionState;
-    }
-
     public static function getFieldsForList($appendTableName = false): array|bool
     {
         $fields = 'id, sp_state, promotion_time_type, promotion_until, banned, picktype, pos_state, category, source, medium, codec, standard, processing, team, audiocodec, leechers, seeders, name, small_descr, times_completed, size, added, comments,anonymous,owner,url,cache_stamp, pt_gen, hr, approval_status';
diff --git a/public/userdetails.php b/public/userdetails.php
index 51a653d5..312e40f7 100644
--- a/public/userdetails.php
+++ b/public/userdetails.php
@@ -312,7 +312,11 @@ tr_small($lang_userdetails['row_forum_posts'], ($forumposts && ($user["id"] == $
 if ($user["id"] == $CURUSER["id"] || get_user_class() >= $viewhistory_class) {
     if (\App\Models\HitAndRun::getIsEnabled()) {
         $hrStatus = (new \App\Repositories\HitAndRunRepository())->getStatusStats($user['id']);
-        tr_small('H&R', sprintf('<a href="%s/myhr.php?userid=%s" target="_blank">%s</a>', getSchemeAndHttpHost(), $user['id'], $hrStatus), 1);
+        tr_small('H&R', sprintf('<a href="myhr.php?userid=%s" target="_blank">%s</a>', $user['id'], $hrStatus), 1);
+    }
+    if (\App\Models\Claim::getConfigIsEnabled()) {
+        $states = (new \App\Repositories\ClaimRepository())->getStats($user['id']);
+        tr_small($lang_functions['menu_claim'], sprintf('<a href="claim.php?uid=%s" target="_blank">%s</a>', $user['id'], $states), 1);
     }
     tr_small($lang_userdetails['row_karma_points'], number_format($user['seedbonus'], 1), 1);
     tr_small($lang_functions['text_seed_points'], number_format($user['seed_points'], 1), 1);
diff --git a/public/viewpeerlist.php b/public/viewpeerlist.php
index 8bf251f6..ba3127e4 100644
--- a/public/viewpeerlist.php
+++ b/public/viewpeerlist.php
@@ -11,6 +11,44 @@ header("Content-Type: text/xml; charset=utf-8");
 
 $id = intval($_GET['id'] ?? 0);
 $seedBoxRep = new \App\Repositories\SeedBoxRepository();
+
+function get_location_column($e, $isStrongPrivacy, $canView): string
+{
+    global $enablelocation_tweak, $seedBoxRep, $lang_functions, $lang_viewpeerlist;
+    if ($enablelocation_tweak == 'yes') {
+        $address = $ips = [];
+        if (!empty($e['ipv4'])) {
+            list($loc_pub, $loc_mod) = get_ip_location($e['ipv4']);
+            $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv4'], $e['userid']);
+            $address[] = $loc_pub . $seedBoxIcon;
+            $ips[] = $e['ipv4'];
+        }
+        if (!empty($e['ipv6'])) {
+            list($loc_pub, $loc_mod) = get_ip_location($e['ipv6']);
+            $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv6'], $e['userid']);
+            $address[] = $loc_pub . $seedBoxIcon;
+            $ips[] = $e['ipv6'];
+        }
+        $title = sprintf('%s%s%s', $lang_functions['text_user_ip'], ':&nbsp;', implode(', ', $ips));
+        $addressStr = implode('<br/>', $address);
+        $location = "<div title='" . $title . "'>" . $addressStr . "</div>";
+    } else {
+        $location = implode(', ', array_filter([$e['ipv4'], $e['ipv6']]));
+    }
+
+    if ($isStrongPrivacy) {
+        $result = '<div style="margin-right: 6px"><i>'.$lang_viewpeerlist['text_anonymous'].'</i></div>';
+        if ($canView) {
+            $result .= $location;
+        }
+    } else {
+        $result = $location;
+    }
+
+    return "<td class=rowfollow align=left width=1%><div style='display: flex;white-space: nowrap;align-items: center'>" . $result . "</div></td>\n";
+}
+
+
 if(isset($CURUSER))
 {
 function dltable($name, $arr, $torrent)
@@ -20,12 +58,13 @@ function dltable($name, $arr, $torrent)
 	global $lang_functions, $seedBoxRep;
 
 	$s = "<b>" . count($arr) . " $name</b>\n";
+	$showLocationColumn = $enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class;
 	if (!count($arr))
 		return $s;
 	$s .= "\n";
 	$s .= "<table width=100% class=main border=1 cellspacing=0 cellpadding=3>\n";
 	$s .= "<tr><td class=colhead align=center width=1%>".$lang_viewpeerlist['col_user_ip']."</td>" .
-	($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "<td class=colhead align=center>".$lang_viewpeerlist['col_location']."</td>" : "").
+	($showLocationColumn ? "<td class=colhead align=center>".$lang_viewpeerlist['col_location']."</td>" : "").
 	"<td class=colhead align=center width=1%>".$lang_viewpeerlist['col_connectable']."</td>".
 	"<td class=colhead align=center width=1%>".$lang_viewpeerlist['col_uploaded']."</td>".
 	"<td class=colhead align=center width=1%>".$lang_viewpeerlist['col_rate']."</td>" .
@@ -40,46 +79,30 @@ function dltable($name, $arr, $torrent)
 	$num = 0;
     $privacyData = \App\Models\User::query()->whereIn('id', array_column($arr, 'userid'))->get(['id', 'privacy'])->keyBy('id');
 	foreach ($arr as $e) {
-//		$privacy = get_single_value("users", "privacy","WHERE id=".sqlesc($e['userid']));
         $privacy = $privacyData->get($e['userid'])->privacy ?? '';
 		++$num;
 
 		$highlight = $CURUSER["id"] == $e['userid'] ? " bgcolor=#BBAF9B" : "";
 		$s .= "<tr$highlight>\n";
-		if($privacy == "strong" || ($torrent['anonymous'] == 'yes' && $e['userid'] == $torrent['owner']))
-		{
-			if(get_user_class() >= $viewanonymous_class || $e['userid'] == $CURUSER['id'])
-				$s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i><br />(" . get_username($e['userid']) . ")";
-			else
-				$s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i></a></td>\n";
-		}
-		else
-			$s .= "<td class=rowfollow align=left width=1%>" . get_username($e['userid']);
-
-		 $secs = max(1, ($e["la"] - $e["st"]));
-		if ($enablelocation_tweak == 'yes'){
-		    $address = $ips = [];
-		    if (!empty($e['ipv4'])) {
-                list($loc_pub, $loc_mod) = get_ip_location($e['ipv4']);
-                $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv4'], $e['userid']);
-                $address[] = $loc_pub . $seedBoxIcon;
-                $ips[] = $e['ipv4'];
+        $secs = max(1, ($e["la"] - $e["st"]));
+		if ($privacy == "strong" || ($torrent['anonymous'] == 'yes' && $e['userid'] == $torrent['owner'])) {
+			if (get_user_class() >= $viewanonymous_class || $e['userid'] == $CURUSER['id']) {
+                $s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i><br />(" . get_username($e['userid']) . ")";
+                if ($showLocationColumn) {
+                    $s .= get_location_column($e, true, true);
+                }
+            } else {
+                $s .= "<td class=rowfollow align=left width=1%><i>".$lang_viewpeerlist['text_anonymous']."</i></a></td>\n";
+                if ($showLocationColumn) {
+                    $s .= get_location_column($e, true, false);
+                }
             }
-            if (!empty($e['ipv6'])) {
-                list($loc_pub, $loc_mod) = get_ip_location($e['ipv6']);
-                $seedBoxIcon = $seedBoxRep->renderIcon($e['ipv6'], $e['userid']);
-                $address[] = $loc_pub . $seedBoxIcon;
-                $ips[] = $e['ipv6'];
+		} else {
+            $s .= "<td class=rowfollow align=left width=1%>" . get_username($e['userid']);
+            if ($showLocationColumn) {
+                $s .= get_location_column($e, false, false);
             }
-            $title = sprintf('%s%s%s', $lang_functions['text_user_ip'], ':&nbsp;', implode(', ', $ips));
-            $addressStr = implode('<br/>', $address);
-			$location = get_user_class() >= $userprofile_class ? "<div title='" . $title . "'>" . $addressStr . "</div>" : $addressStr;
-			$s .= "<td class=rowfollow align=left width=1%><nobr>" . $location . "</nobr></td>\n";
-		}
-		elseif (get_user_class() >= $userprofile_class){
-			$location = implode(', ', array_filter([$e['ipv4'], $e['ipv6']]));
-			$s .= "<td class=rowfollow align=center width=1%><nobr>" . $location . "</nobr></td>\n";
-		}
+        }
 
 		$s .= "<td class=rowfollow align=center width=1%><nobr>" . ($e['connectable'] == "yes" ? $lang_viewpeerlist['text_yes'] : "<font color=red>".$lang_viewpeerlist['text_no']."</font>") . "</nobr></td>\n";
 		$s .= "<td class=rowfollow align=center width=1%><nobr>" . mksize($e["uploaded"]) . "</nobr></td>\n";