Filters and batch delete fixed