Adds oderBy time and improves time formatting