Grinding - adding query timestamps also