Improve server finding system