I think the correct fix would be `used_by_tenant_id=context.tenant_id`, not removing the whole filter.