fixed simple_usages been available with and without tenant_id