Move watch filter into storage level

Fix #2663  @smarterclayton 
The "status" aspect of pods probably should be set here by the watch command in filter.  Can you add a todo to add status to watch here?