more PeerSubscriptionTree performance improvements