Improvements in team service layer. Improved search and context