Merge branch 'hotfix'
avoid js error when no datapoints
Merge branch 'hotfix' into staging