fix exception when no current match exists
Merge branch 'Adar'
Merge branch 'Eran'
Team name- search all fields if not found of XS
Merge branch 'master' into Eran