fix avoid to watch all nodes but only hosts
Merge remote-tracking branch 'origin/master'