diff --git a/plugins/hiscore/hiscore.dat b/plugins/hiscore/hiscore.dat
index 04c9105d2cc..bf910864830 100644
--- a/plugins/hiscore/hiscore.dat
+++ b/plugins/hiscore/hiscore.dat
@@ -2835,6 +2835,86 @@ cosmica2:
 
 ;@s:cps1.cpp
 
+;******Street Fighter II' - Hyper Fighting (World 921209)
+sf2acc:
+sf2acca:
+sf2amf:
+sf2amf2:
+sf2bhh:
+sf2ce:
+sf2ceb:
+sf2ceblp:
+sf2ceea:
+sf2ceja:
+sf2cejb:
+sf2cejc:
+sf2cet:
+sf2ceua:
+sf2ceub:
+sf2ceuc:
+sf2ceupl:
+sf2dkot2:
+sf2dongb:
+sf2hf:
+sf2hfj:
+sf2hfu:
+sf2koryu:
+sf2m1:
+sf2m2:
+sf2m4:
+sf2m5:
+sf2m6:
+sf2m7:
+sf2m8:
+sf2m9:
+sf2mdt:
+sf2mdta:
+sf2mdtb:
+sf2rb:
+sf2rb2:
+sf2rb3:
+sf2yyc:
+@:maincpu,program,ffd276,28,00,20
+@:maincpu,program,ffd2c6,14,ff,96
+@:maincpu,program,ffd2ee,04,00,00
+
+
+;street fighter 2 (US 910318)(clone)(by tamphax)
+sf2:
+sf2b:
+sf2eb:
+sf2ebbl:
+sf2ebbl2:
+sf2ebbl3:
+sf2ed:
+sf2ee:
+sf2em:
+sf2j:
+sf2j17:
+sf2ja:
+sf2jc:
+sf2jf:
+sf2jh:
+sf2jl:
+sf2qp1:
+sf2qp2:
+sf2rk:
+sf2stt:
+sf2thndr:
+sf2thndr2:
+sf2ua:
+sf2ub:
+sf2uc:
+sf2ud:
+sf2ue:
+sf2uf:
+sf2ug:
+sf2ui:
+sf2uk:
+@:maincpu,program,ffd28a,30,00,20
+@:maincpu,program,ffd302,04,00,00
+
+
 sf2b2:
 sf2rules:
 @:maincpu,program,ffd28a,30,00,20
@@ -2883,41 +2963,6 @@ cawingur1:
 @:maincpu,program,ffda2c,04,00,00
 
 
-;street fighter 2 (US 910318)(clone)(by tamphax)
-sf2:
-sf2b:
-sf2eb:
-sf2ebbl:
-sf2ebbl2:
-sf2ebbl3:
-sf2ed:
-sf2ee:
-sf2em:
-sf2j:
-sf2j17:
-sf2ja:
-sf2jc:
-sf2jf:
-sf2jh:
-sf2jl:
-sf2qp1:
-sf2qp2:
-sf2rk:
-sf2stt:
-sf2thndr:
-sf2ua:
-sf2ub:
-sf2uc:
-sf2ud:
-sf2ue:
-sf2uf:
-sf2ug:
-sf2ui:
-sf2uk:
-@:maincpu,program,ffd28a,30,00,20
-@:maincpu,program,ffd302,04,00,00
-
-
 dino:
 dinoa:
 dinohunt:
@@ -2927,49 +2972,6 @@ dinou:
 @:maincpu,program,fff34e,010,99,00
 
 
-;******Street Fighter II' - Hyper Fighting (World 921209)
-sf2acc:
-sf2acca:
-sf2amf:
-sf2amf2:
-sf2bhh:
-sf2ce:
-sf2ceblp:
-sf2ceea:
-sf2ceja:
-sf2cejb:
-sf2cejc:
-sf2cet:
-sf2ceua:
-sf2ceub:
-sf2ceuc:
-sf2ceupl:
-sf2dkot2:
-sf2dongb:
-sf2hf:
-sf2hfj:
-sf2hfu:
-sf2koryu:
-sf2m1:
-sf2m2:
-sf2m4:
-sf2m5:
-sf2m6:
-sf2m7:
-sf2m8:
-sf2m9:
-sf2mdt:
-sf2mdta:
-sf2mdtb:
-sf2rb:
-sf2rb2:
-sf2rb3:
-sf2yyc:
-@:maincpu,program,ffd276,28,00,20
-@:maincpu,program,ffd2c6,14,ff,96
-@:maincpu,program,ffd2ee,04,00,00
-
-
 qad:
 @:maincpu,program,ffe96e,3c,00,70
 
@@ -4263,7 +4265,7 @@ oscaru:
 
 lastmisn:
 lastmisnj:
-lastmisno:
+lastmisnu5:
 @:maincpu,program,09aa,3c,00,44
 @:maincpu,program,0006,3,00,00
 
@@ -4984,6 +4986,30 @@ enigma2b:
 
 ;@s:eolith.cpp
 
+landbrka:
+@:maincpu,program,400293f5,4b,00,20
+
+
+landbrk:
+@:maincpu,program,400284fd,4b,00,20
+
+
+landbrkb:
+@:maincpu,program,40028ab1,4b,00,20
+
+
+ironfort:
+@:maincpu,program,400177c0,24,43,20
+@:maincpu,program,4002852c,14,00,10
+@:maincpu,program,40028578,4,00,30
+
+
+ironfortc:
+@:maincpu,program,40016338,24,43,20
+@:maincpu,program,40027d20,14,00,10
+@:maincpu,program,40027d6c,4,00,30
+
+
 ;candy:** you must wait untill hiscore table has displayed before starting a game  **
 candy:
 @:maincpu,program,40025660,f0,41,02
@@ -5199,6 +5225,7 @@ savgbees:
 exerion:
 exerionb:
 exeriont:
+irion:
 @:maincpu,program,6600,c8,00,00
 @:maincpu,program,6700,28,00,00
 
@@ -5706,6 +5733,12 @@ maniacsp:
 
 ;@s:gaelco2.cpp
 
+;*******(world rally 2: twin racing)(By Firebrand)
+wrally2:
+wrally2a:
+@:maincpu,program,fec766,288,5a,ff
+
+
 ;maniac square (unprotected)(by tamphax)
 maniacsq:
 maniacsqa:
@@ -5726,11 +5759,6 @@ bang:
 @:maincpu,program,fe5a4c,ee,41,01
 
 
-;*******(world rally 2: twin racing)(By Firebrand)
-wrally2:
-@:maincpu,program,fec766,288,5a,ff
-
-
 ;******bang! (japan)
 bangj:
 @:maincpu,program,fe5a50,f0,30,01
@@ -5852,10 +5880,6 @@ galaxiac:
 
 ;@s:galaxian.cpp
 
-mshuttlea:
-@:maincpu,program,808a,57,00,24
-
-
 ;amidar:[Special thanks to Cananas for enhancing this entry]
 amidar:
 amidar1:
@@ -5866,12 +5890,17 @@ amigo:
 amigo2:
 scobra:
 scobrab:
+scobrag:
 scobras:
 scobrase:
 @:maincpu,program,8200,1e,00,01
 @:maincpu,program,80a8,03,00,01
 
 
+mshuttlea:
+@:maincpu,program,808a,57,00,24
+
+
 ;(zero time)
 asideral:
 astrians:
@@ -7082,6 +7111,14 @@ junofrstg:
 
 ;@s:kaneko16.cpp
 
+;*******bakuretsu breaker
+;******Explosive Breaker
+bakubrkr:
+explbrkr:
+explbrkrk:
+@:maincpu,program,10c01a,63,00,4e
+
+
 ;brapboys:hiscore broken in game  brapboys games ??
 brapboys:
 brapboysp:
@@ -7100,13 +7137,6 @@ blazeon:
 @:maincpu,program,30020c,8,00,00
 
 
-;*******bakuretsu breaker
-;******Explosive Breaker
-bakubrkr:
-explbrkr:
-@:maincpu,program,10c01a,63,00,4e
-
-
 berlwall:
 berlwallk:
 berlwallt:
@@ -11629,6 +11659,7 @@ zerohouri:
 ;@s:renegade.cpp
 
 renegade:
+renegadeb:
 @:maincpu,program,101b,28,00,4c
 @:maincpu,program,2e,3,00,05
 
@@ -12151,6 +12182,13 @@ ichirj:
 
 ;@s:segae.cpp
 
+opaopa:
+opaopan:
+@:maincpu,program,c175,38,00,14
+@:maincpu,program,c233,4,00,00
+@:maincpu,program,c234,1,06,06
+
+
 ;tetrisse:******Tetris (Japan, System E)
 tetrisse:
 @:maincpu,program,ccc1,9f,4a,04
@@ -12277,6 +12315,16 @@ spacfurya:
 
 ;@s:segahang.cpp
 
+;enduror1:******Enduro Racer (YM2203, FD1089B 317-0013A)
+;(enduro racer (bootleg set 1))
+endurobl:
+enduror:
+enduror1:
+endurora:
+@:maincpu,program,43400,4a0,01,20
+@:maincpu,program,43b90,10,99,99
+
+
 ;(super hang-on (bootleg))
 shangon2:
 shangonho:
@@ -12288,15 +12336,6 @@ shangonro:
 @:maincpu,program,20d678,70,99,99
 
 
-;enduror1:******Enduro Racer (YM2203, FD1089B 317-0013A)
-;(enduro racer (bootleg set 1))
-endurobl:
-enduror:
-enduror1:
-@:maincpu,program,43400,4a0,01,20
-@:maincpu,program,43b90,10,99,99
-
-
 ;hangon1:******Hang-On
 ;note best lap time are not saved
 hangon:
@@ -15596,6 +15635,7 @@ tbowlp:
 
 ;@s:tecmo.cpp
 
+silkwormb:
 silkwormp:
 @:maincpu,program,d262,61,00,59
 @:maincpu,program,c848,18,20,30
@@ -16235,6 +16275,11 @@ fireshrkdh:
 
 ;@s:toaplan2.cpp
 
+ghoxjo:
+@:maincpu,program,805a4,64,00,8e
+@:maincpu,program,80006,4,00,00
+
+
 ;(teki paki)
 tekipaki:
 tekipakit:
diff --git a/plugins/hiscore/sort_hiscore.lua b/plugins/hiscore/sort_hiscore.lua
index 3e481d0a582..b63bfe1673a 100644
--- a/plugins/hiscore/sort_hiscore.lua
+++ b/plugins/hiscore/sort_hiscore.lua
@@ -107,23 +107,6 @@ for num, entry in ipairs(entries) do
 	end
 end
 
-for num1, entry in ipairs(sorted) do
-	if entry.name then
-		for num2, name in ipairs(entry.name) do
-			local curname = name:match("[^:]*")
-			for num3, entry2 in ipairs(sorted) do
-				if entry2.name and entry.src == entry2.src and entry ~= entry2 then
-					for num4, name2 in ipairs(entry2.name) do
-						if curname == name2:match("[^:]*") then
-							print(name, "duplicate name")
-						end
-					end
-				end
-			end
-		end
-	end
-end
-
 for num1, entry in ipairs(sorted) do
 	if entry.data then
 		for num2, entry2 in ipairs(sorted) do
@@ -152,6 +135,27 @@ for num1, entry in ipairs(sorted) do
 	end
 end
 
+for num1, entry in ipairs(sorted) do
+	if entry.name then
+		for num2, name in ipairs(entry.name) do
+			local curname = name:match("[^:]*")
+			for num3, entry2 in ipairs(sorted) do
+				if entry2.name and entry.src == entry2.src then
+					for num4, name2 in ipairs(entry2.name) do
+						if curname == name2:match("[^:]*") then
+							if entry ~= entry2 then
+								print(name, "duplicate name")
+							elseif num2 ~= num4 then
+								entry2.name[num4] = nil
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
 -- copyright 2010 Uli Schlachter GPLv2
 function stable_sort(list, comp)
 	-- A table could contain non-integer keys which we have to ignore.