group by work and cleanups to parsing saved charts.