Hotfix: filter search on Tenant & logger for ES