Further fixes to the deleting same tag multiple times on same event
issue