CVS-109

Search fails with collocations

CVS-127
"a a" name for team cause NullPointerException

CVS-129
Search doesn't work for teams with composite names like "team team"