fix so that empty names just use filled in name