diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt
index daa799145..b4a709129 100644
--- a/data/languages/catalan.txt
+++ b/data/languages/catalan.txt
@@ -1301,46 +1301,46 @@ CHN
 == CHN
 
 The format of texture %s is not RGBA which will cause visual bugs.
-== 
+== El format de la textura %s no és RGBA i pot causar errors visuals.
 
 Join Tutorial Server
-== 
+== Entrar al tutorial
 
 Skip Tutorial
-== 
+== Saltar el Tutorial
 
 Settings file
-== 
+== Arxiu de configuració
 
 Config directory
-== 
+== Directori amb la configuració
 
 Windowed fullscreen
-== 
+== Windowed fullscreen
 
 Renderer
-== 
+== Renderitzador
 
 default
-== 
+== predeterminat
 
 custom
-== 
+== personalitzat
 
 Graphics cards
-== 
+== Tarjetes gràfiques
 
 auto
-== 
+== auto
 
 Run on join
-== 
+== Córrer en unir-se
 
 Chat command (e.g. showall 1)
-== 
+== Commanda del xat (e.g showall 1)
 
 Tutorial
-== 
+== Tutorial
 
 Can't find a Tutorial server
-== 
+== No s'ha pogut trobar un servidor del tutorial
diff --git a/src/game/server/scoreworker.cpp b/src/game/server/scoreworker.cpp
index 1ccc23337..43404f8b2 100644
--- a/src/game/server/scoreworker.cpp
+++ b/src/game/server/scoreworker.cpp
@@ -779,9 +779,9 @@ bool CScoreWorker::ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData,
 	// check sort method
 	char aBuf[512];
 	str_format(aBuf, sizeof(aBuf),
-		"SELECT Name, Time, Ranking, Server "
+		"SELECT Name, Time, Ranking "
 		"FROM ("
-		"  SELECT RANK() OVER w AS Ranking, MIN(Time) AS Time, MAX(Server) AS Server, Name "
+		"  SELECT RANK() OVER w AS Ranking, MIN(Time) AS Time, Name "
 		"  FROM %s_race "
 		"  WHERE Map = ? "
 		"  AND Server LIKE ? "
@@ -809,7 +809,6 @@ bool CScoreWorker::ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData,
 
 	char aTime[32];
 	bool End = false;
-	bool HasLocal = false;
 
 	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
 	{
@@ -821,48 +820,35 @@ bool CScoreWorker::ShowTop(IDbConnection *pSqlServer, const ISqlData *pGameData,
 		str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
 			"%d. %s Time: %s", Rank, aName, aTime);
 
-		char aRecordServer[6];
-		pSqlServer->GetString(4, aRecordServer, sizeof(aRecordServer));
-
-		HasLocal = HasLocal || str_comp(aRecordServer, pData->m_aServer) == 0;
-
 		Line++;
 	}
 
-	if(!HasLocal)
+	char aServerLike[16];
+	str_format(aServerLike, sizeof(aServerLike), "%%%s%%", pData->m_aServer);
+
+	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
-		char aServerLike[16];
-		str_format(aServerLike, sizeof(aServerLike), "%%%s%%", pData->m_aServer);
+		return true;
+	}
+	pSqlServer->BindString(1, pData->m_aMap);
+	pSqlServer->BindString(2, aServerLike);
+	pSqlServer->BindInt(3, 3);
 
-		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
-		{
-			return true;
-		}
-		pSqlServer->BindString(1, pData->m_aMap);
-		pSqlServer->BindString(2, aServerLike);
-		pSqlServer->BindInt(3, 3);
+	str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
+		"------------ %s Top ------------", pData->m_aServer);
+	Line++;
 
+	// show top
+	while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
+	{
+		char aName[MAX_NAME_LENGTH];
+		pSqlServer->GetString(1, aName, sizeof(aName));
+		float Time = pSqlServer->GetFloat(2);
+		str_time_float(Time, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+		int Rank = pSqlServer->GetInt(3);
 		str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
-			"------------ %s Top ------------", pData->m_aServer);
+			"%d. %s Time: %s", Rank, aName, aTime);
 		Line++;
-
-		// show top
-		while(!pSqlServer->Step(&End, pError, ErrorSize) && !End)
-		{
-			char aName[MAX_NAME_LENGTH];
-			pSqlServer->GetString(1, aName, sizeof(aName));
-			float Time = pSqlServer->GetFloat(2);
-			str_time_float(Time, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
-			int Rank = pSqlServer->GetInt(3);
-			str_format(pResult->m_Data.m_aaMessages[Line], sizeof(pResult->m_Data.m_aaMessages[Line]),
-				"%d. %s Time: %s", Rank, aName, aTime);
-			Line++;
-		}
-	}
-	else
-	{
-		str_copy(pResult->m_Data.m_aaMessages[Line], "---------------------------------------",
-			sizeof(pResult->m_Data.m_aaMessages[Line]));
 	}
 
 	return !End;
diff --git a/src/test/score.cpp b/src/test/score.cpp
index 5065e2a21..2778896b3 100644
--- a/src/test/score.cpp
+++ b/src/test/score.cpp
@@ -164,7 +164,8 @@ TEST_P(SingleScore, TopServer)
 	ExpectLines(m_pPlayerResult,
 		{"------------ Global Top ------------",
 			"1. nameless tee Time: 01:40.00",
-			"---------------------------------------"});
+			"------------ USA Top ------------",
+			"1. nameless tee Time: 01:40.00"});
 }
 
 TEST_P(SingleScore, RankServer)