ToC to match headings actually visible on the page

Currently if a section is hidden using Conditional Display rules, headings from within the section will still appear in the Table of Contents. You can add the same rule to each heading, but it's a chore and difficult to maintain. Could the ToC block use the filtered (visible) list of headings to prevent the need for this?