Improve and fix FeedWatcher