Move watch filter into storage level

Fix #2663  @smarterclayton 
Cool.  I'll file a bug for it, yet another bug.  I'd like to keep this PR to only address the issue of watch filter layer.

I vote for updater or transform since filter is somewhat confusing.  But I guess it has other meanings as well.  So using watch.Filter looks good to me.