Tweak forced listhost subscription logic