Fix issue with event
Fix problem with recurrent events and today's event