Improved event name showing, should now be corner-case resilient