[mv3] Improve handling of manual editing of custom filters

This fixes the creation/removal of spurious intermediate custom
filters when manually editing.