Sort tenants before adding zones