Remove batch_update from filter and filter_clear usages