Move watch filter into storage level

Fix #2663  @smarterclayton 
It might be more appropriate to fillCirrentState here via a filter instead of doing it in the registry.  It's less clear of a case than pod status though, and having the registry do it (or via a wrapper to the registry) is also acceptable.  I guess I'm fine with the inconsistency here for now.