Settlement name display fixes