Move watch filter into storage level

Fix #2663  @smarterclayton 
Done.   We didn't set pod status for watch command previously? How does client get pod with current status by watching...