Better handling of events without links