fixing server.tenantId() to return current tenant