Improved handling of upcoming/ongoing events (including table)