demoted tenancy label fixes