Changed player search logic trying to improve  performance