Correcting handling of Trigger & Why & Note