Move watch filter into storage level

Fix #2663  @smarterclayton 
Ok, I'll rephrase a little bit.