Fix issue with next event date when there are no upcoming events
Fix issue with next event date when there are no upcoming events