Move watch filter into storage level
Merge pull request #2665 from ddysher/fix-watch-filter

Move watch filter into storage level