diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5210f141..eb556017 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,7 +6,7 @@
 **Merged pull requests:**
 
 - Release v2.1.5-2023.10 🎉
-- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298) ([belomaxorka](https://github.com/belomaxorka))
+- Minor improvements [\#297](https://github.com/torrentpier/torrentpier-lts/pull/297), [\#298](https://github.com/torrentpier/torrentpier-lts/pull/298), [\#300](https://github.com/torrentpier/torrentpier-lts/pull/300) ([belomaxorka](https://github.com/belomaxorka))
 
 ## [v2.1.5-2023.09](https://github.com/torrentpier/torrentpier-lts/tree/v2.1.5-2023.09) (2023-10-04)
 [Full Changelog](https://github.com/torrentpier/torrentpier-lts/compare/v2.1.5-2023.08-HotFix...v2.1.5-2023.09)
diff --git a/library/ajax/group_membership.php b/library/ajax/group_membership.php
index da8bae14..81bbeadd 100644
--- a/library/ajax/group_membership.php
+++ b/library/ajax/group_membership.php
@@ -30,7 +30,7 @@ switch ($mode)
 		{
 			$class  = ($row['user_pending']) ? 'med' : 'med bold';
 			$class .= ($row['group_moderator'] == $user_id) ? ' colorMod' : '';
-			$href   = "group.php?g={$row['group_id']}";
+			$href   = GROUP_URL . $row['group_id'];
 
 			if (IS_ADMIN)
 			{
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index a226f219..b471791b 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -462,7 +462,7 @@ if ($tor_reged && $tor_info)
 						if (!defined('LEECHER_EXIST'))
 						{
 							define('LEECHER_EXIST', true);
-							$leech_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full#leechers";
+							$leech_order_action = TOPIC_URL ."$bt_topic_id&spmode=full#leechers";
 
 							$template->assign_block_vars("$x_full", array(
 								'LEECH_ORD_ACT'     => $leech_order_action,
diff --git a/library/includes/functions_atom.php b/library/includes/functions_atom.php
index 231fa7ab..d4bc103b 100644
--- a/library/includes/functions_atom.php
+++ b/library/includes/functions_atom.php
@@ -174,7 +174,7 @@ function create_atom ($file_path, $mode, $id, $title, $topics)
 		$atom .= "	</author>\n";
 		$atom .= "	<updated>". $date ."T$time+00:00</updated>\n";
 		$atom .= "	<id>tag:rto.feed,". $date .":/t/$topic_id</id>\n";
-		$atom .= "	<link href=\"viewtopic.php?t=$topic_id\" />\n";
+		$atom .= "	<link href=\"".TOPIC_URL."$topic_id\" />\n";
 		$atom .= "</entry>\n";
 	}
 	$atom .= "</feed>";
@@ -183,4 +183,4 @@ function create_atom ($file_path, $mode, $id, $title, $topics)
 	fwrite($fp, $atom);
 	fclose ($fp);
 	return true;
-}
\ No newline at end of file
+}