Move watch filter into storage level