Fixed #5: Better handling of multi-day events