Also recognize title parts/labels being added to remove mark, properly calculate since filter