@TheGrinder I have fixed the issue with the event being added and have implemented your excellent suggestion about grabbing the latest kind 30311 event.
You can see the new flow in the video below.
Once again thank you for testing and giving your feedback.
I will spend tomorrow testing and making sure I did not add any new bugs and then will get this updated version out as soon as I can.