[BUGFIX] Ensure that events can be correlated to components by the full component URI