Limit graph data

And better date handling