diff --git a/content/jobstatus.php b/content/jobstatus.php
index 0fa46928..0a912105 100644
--- a/content/jobstatus.php
+++ b/content/jobstatus.php
@@ -60,30 +60,8 @@ function get_status2($num, $fail, $error, $total){
 	while ( $row = mysql_fetch_assoc($result) ) {
 		if ( $row["run_id"] != $last ) {
 			if ( $last ) {
-				if ( $addBrowser ) {
-					$header = "<tr><th></th>\n";
-					$last_browser = array();
-					foreach ( $browsers as $browser ) {
-						if ( $last_browser["id"] != $browser["id"] ) {
-							$header .= '<th><div class="browser">' .
-								'<img src="' . swarmpath( 'images/' ) . $browser["engine"] .
-								'.sm.png" class="browser-icon ' . $browser["engine"] .
-								'" alt="' . $browser["name"] .
-								'" title="' . $browser["name"] .
-								'"/><span class="browser-name">' .
-								preg_replace('/\w+ /', "", $browser["name"]) . ', ' .
-								'</span></div></th>';
-						}
-						$last_browser = $browser;
-					}
-					$header .= "</tr>\n";
-					$output = $header . $output;
-				}
-
-				$output .= "</tr>\n";
 				$addBrowser = false;
 			}
-
 			$useragents = array();
 
 			$runResult = mysql_queryf("SELECT run_client.client_id as client_id, run_client.status as status, run_client.fail as fail, run_client.error as error, run_client.total as total, clients.useragent_id as useragent_id FROM run_client, clients WHERE run_client.run_id=%u AND run_client.client_id=clients.id ORDER BY useragent_id;", $row["run_id"]);
@@ -137,5 +115,26 @@ function get_status2($num, $fail, $error, $total){
 		$last = $row["run_id"];
 	}
 
+	if ( $last ) {
+		$header = "<tr><th></th>\n";
+		$last_browser = array();
+		foreach ( $browsers as $browser ) {
+			if ( $last_browser["id"] != $browser["id"] ) {
+				$header .= '<th><div class="browser">' .
+					'<img src="' . swarmpath( 'images/' ) . $browser["engine"] .
+					'.sm.png" class="browser-icon ' . $browser["engine"] .
+					'" alt="' . $browser["name"] .
+					'" title="' . $browser["name"] .
+					'"/><span class="browser-name">' .
+					preg_replace('/\w+ /', "", $browser["name"]) . ', ' .
+					'</span></div></th>';
+			}
+			$last_browser = $browser;
+		}
+		$header .= "</tr>\n";
+		$output = $header . $output;
+		$output .= "</tr>\n";
+	}
+
 	echo "$output</tr>\n</tbody>\n</table>";
 ?>
diff --git a/content/tinder.php b/content/tinder.php
index efb56125..2f878d1c 100644
--- a/content/tinder.php
+++ b/content/tinder.php
@@ -24,7 +24,7 @@ function get_status2($num, $fail, $error, $total){
 		}
 	}
 
-	$result = mysql_query("SELECT useragents.engine as engine, useragents.name as name, clients.os as os, DATE_FORMAT(clients.created, '%Y-%m-%dT%H:%i:%sZ') as since FROM users, clients, useragents WHERE clients.useragent_id=useragents.id AND DATE_ADD(clients.updated, INTERVAL 1 minute) > NOW() AND clients.user_id=users.id AND users.name='$search_user' ORDER BY useragents.engine, useragents.name;");
+	$result = mysql_queryf("SELECT useragents.engine as engine, useragents.name as name, clients.os as os, DATE_FORMAT(clients.created, '%Y-%m-%dT%H:%i:%sZ') as since FROM users, clients, useragents WHERE clients.useragent_id=useragents.id AND DATE_ADD(clients.updated, INTERVAL 1 minute) > NOW() AND clients.user_id=users.id AND users.name=%s ORDER BY useragents.engine, useragents.name;", $search_user);
 
 	if ( mysql_num_rows($result) > 0 ) {
 
@@ -77,6 +77,7 @@ function get_status2($num, $fail, $error, $total){
 	$output = "";
 	$browsers = array();
 	$addBrowser = true;
+	$last = "";
 
 	while ( $row = mysql_fetch_array($search_result) ) {
 		$job_name = $row[0];
@@ -90,31 +91,9 @@ function get_status2($num, $fail, $error, $total){
 
 	$result = mysql_queryf("SELECT runs.id as run_id, runs.url as run_url, runs.name as run_name, useragents.engine as browser, useragents.name as browsername, useragents.id as useragent_id, run_useragent.status as status FROM run_useragent, runs, useragents WHERE runs.job_id=%u AND run_useragent.run_id=runs.id AND run_useragent.useragent_id=useragents.id ORDER BY run_id, browsername;", $job_id);
 
-	$last = "";
-
 	while ( $row = mysql_fetch_assoc($result) ) {
 		if ( $row["run_id"] != $last ) {
 			if ( $last ) {
-				if ( $addBrowser ) {
-					$header = "<tr><th></th>\n";
-					$last_browser = array();
-					foreach ( $browsers as $browser ) {
-						if ( $last_browser["id"] != $browser["id"] ) {
-							$header .= '<th><div class="browser">' .
-								'<img src="' . swarmpath( 'images/' ) . $browser["engine"] .
-								'.sm.png" class="browser-icon ' . $browser["engine"] .
-								'" alt="' . $browser["name"] .
-								'" title="' . $browser["name"] .
-								'"/><span class="browser-name">' .
-								preg_replace('/\w+ /', "", $browser["name"]) . ', ' .
-								'</span></div></th>';
-						}
-						$last_browser = $browser;
-					}
-					$header .= "</tr>\n";
-					$output = $header . $output;
-				}
-
 				$addBrowser = false;
 			}
 
@@ -175,6 +154,7 @@ function get_status2($num, $fail, $error, $total){
 		$last = $row["run_id"];
 	}
 
+
 	foreach ( $results as $key => $fail ) {
 		$output .= "<td class='" . $states[$key] . "'></td>";
 	}
@@ -182,6 +162,26 @@ function get_status2($num, $fail, $error, $total){
 	$output .= "</tr>\n";
 
 	}
+	
+	if ( $last ) {
+		$header = "<tr><th></th>\n";
+		$last_browser = array();
+		foreach ( $browsers as $browser ) {
+			if ( $last_browser["id"] != $browser["id"] ) {
+				$header .= '<th><div class="browser">' .
+					'<img src="' . swarmpath( 'images/' ) . $browser["engine"] .
+					'.sm.png" class="browser-icon ' . $browser["engine"] .
+					'" alt="' . $browser["name"] .
+					'" title="' . $browser["name"] .
+					'"/><span class="browser-name">' .
+					preg_replace('/\w+ /', "", $browser["name"]) . ', ' .
+					'</span></div></th>';
+			}
+			$last_browser = $browser;
+		}
+		$header .= "</tr>\n";
+		$output = $header . $output;
+	}
 
 	echo "$output</tr>\n</tbody>\n</table>";