Fix: ZEN-9037, refined graph labels