fix tenant searching
Merge branch 'hotfix/hotfix/fix-tenant-searching'
Merge tag 'hotfix/fix-tenant-searching' into develop

fix tenant searching