Fix discovery for more than one publisher per host

The current implementation has no late subscribe yet. @jafyvilla is working on that.