Change towStartAvgTime query (#546)