Slight edits to charting logic now that there are no child-keys in JSON
Merge branch 'dev'