some fixes to scenario and multi_tenants