add filter options and working on watch task