Added also removal of old timeout handle. So now it might even fire off multiple times.
Fixed the router name handling to be self-only.