Per hour grouping now happens quicker