Fix: Make chart generation work like maps