Avoid computing graph when not required
Fix display of last vertical edge of entry