Trigger visbility improvements