Fix Last Month and Last week graphs. Closes #1853