Updated fields to work correctly for all chart types

Signed-off-by: Bjørn Johansen <post@bjornjohansen.no>