diff --git a/library/includes/functions.php b/library/includes/functions.php
index 069215fe3..00635ad06 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -1781,11 +1781,6 @@ function decode_text_match($txt)
     return str_replace(''', "'", $txt);
 }
 
-function pad_with_space($str)
-{
-    return $str ? " $str " : $str;
-}
-
 /**
  * Create magnet link
  *
diff --git a/search.php b/search.php
index 714c2af12..b0d11a256 100644
--- a/search.php
+++ b/search.php
@@ -366,7 +366,7 @@ if (!$items_found) {
     }
 
     // Forum
-    $forum_selected = '';
+    $forum_selected = [];
     if ($var =& $_REQUEST[$forum_key]) {
         $forum_selected = get_id_ary($var);
 
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index 7af84503c..edfc7e498 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -3,7 +3,7 @@
 <form method="post" action="{S_MODE_ACTION}" name="post">
 <table width="100%">
 	<tr>
-		<td align="right" class="med" nowrap="nowrap">{L_SORT_BY}:&nbsp;{S_MODE_SELECT}&nbsp;&nbsp;{L_ORDER}&nbsp;{S_ORDER_SELECT}&nbsp;&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}" /></td>
+		<td align="right" class="med" nowrap="nowrap">{L_SORT_BY}:&nbsp;{S_MODE_SELECT}&nbsp;&nbsp;{L_ORDER}:&nbsp;{S_ORDER_SELECT}&nbsp;&nbsp;<input type="submit" name="submit" value="{L_SUBMIT}" /></td>
 	</tr>
 	<tr>
 		<td align="right" nowrap="nowrap">
diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
index ecb0c4530..f6dc5164e 100644
--- a/styles/templates/default/tracker.tpl
+++ b/styles/templates/default/tracker.tpl
@@ -169,7 +169,7 @@ $(function(){
 
 <div id="fs-nav-legend" style="display: none;">
 	<select id="fs-sel-cat"><option value="all">&nbsp;{L_SELECT_CAT}&nbsp;</option></select>
-	<span id="fs-nav-menu">&middot;&nbsp;<a class="menu-root" href="#fs-nav-list">{L_GO_TO_SECTION}</a></span>
+	<span id="fs-nav-menu">&nbsp;&middot;&nbsp;<a class="menu-root" href="#fs-nav-list">{L_GO_TO_SECTION}</a></span>
 </div>
 
 <form method="POST" name="post" action="{TOR_SEARCH_ACTION}#results">
@@ -181,7 +181,7 @@ $(function(){
 	<th class="thHead">{L_TOR_SEARCH_TITLE}</th>
 </tr>
 <tr>
-	<td class="row4" style="padding: 4px";>
+	<td class="row4" style="padding: 4px;">
 
 		<table class="fieldsets borderless bCenter pad_0" cellspacing="0">
 		<tr>
diff --git a/tracker.php b/tracker.php
index f93f5b266..07d666685 100644
--- a/tracker.php
+++ b/tracker.php
@@ -46,11 +46,8 @@ $lastvisit = (!IS_GUEST) ? $userdata['user_lastvisit'] : '';
 $search_id = (isset($_GET['search_id']) && verify_id($_GET['search_id'], SEARCH_ID_LENGTH)) ? $_GET['search_id'] : '';
 $session_id = $userdata['session_id'];
 
-if ($tor_statuses = IS_AM && $bb_cfg['tracker']['search_by_tor_status']) {
-    if ($status = $_POST['status']) {
-        $status_list = !empty($status) ? implode(', ', $status) : false;
-    }
-}
+$status = $_POST['status'] ?? false;
+$status_list = !empty($status) ? implode(', ', $status) : false;
 
 $cat_forum = $tor_to_show = $search_in_forums_ary = array();
 $title_match_sql = $title_match_q = $search_in_forums_csv = '';
@@ -811,7 +808,7 @@ $search_all_opt = '<option value="' . $search_all . '" value="fs-' . $search_all
 $cat_forum_select = "\n" . '<select id="fs-main" style="width: 100%;" name="' . $forum_key . '[]" multiple size="' . $forum_select_size . "\">\n" . $search_all_opt . $opt . "</select>\n";
 
 // Status select
-if ($tor_statuses) {
+if (IS_AM && $bb_cfg['tracker']['search_by_tor_status']) {
     $statuses = '<table border="0" cellpadding="0" cellspacing="0">';
     foreach (array_chunk($bb_cfg['tor_icons'], 2, true) as $statuses_part) {
         $statuses .= '<tr>';