Fix watch filtering in admin