Better fix for #11664

If the object name is contained in the map, then always set the text: this ensure that we have exactly the same behaviour as before.