Fixed empty display name with original value

TNL-344

Fix display name of unit if it is left empty then filled it with original value. Added bok-choy test.
A minor point, but please follow the indentation style of the rest of the file.