WIP - playing around with moving hasSubscription call out of eventstream unsubscribe call,
TODO - more verifying it that's actually enough, or if periodic scan has to be employed as discussed previously