timeseries ordering and labeling fixes

Change-Id: Ifc272b374806e38bc6b0d5e5da1bf10c15530e1f