fix tenant searching
Merge branch 'hotfix/hotfix/fix-tenant-searching'