Make upcoming dates refresh correctly