Added more fixes to empty name strings.