fix for tenant view