[Event] Rework redirect subscriber