replacing blanket subscribe statements with poll-specific subscriptions