Improvements to router handling of subscriptions