Fixed tagging at the event level