Move watch filter into storage level

Fix #2663  @smarterclayton 
Errors are a thing and they are known to happen.