(wip): multiple changes to make graphs work with production data