add filtering to watcher