Multi-tenant final fixes

Related with operations at startup and location index.
The renaming tenant -> service is also taken into account.