Further tweaked player search