It’s a clear need. I wonder if my tagging proposal would work here. Sounds like it does to me. Especially if we are using replacement events.