Tweaked a bit how notifications without ID are handled.