Problem with Table of Contents Formatting

I've set up my table of contents using two levels of formatting.  Here is a preview.

When I update the toc, it applies my Page Heading character style to one of the toc paragraph styles as you can see here.

To solve this, I select all of the toc text and manually set the character style to "None" on the character styles panel.  As you can see, that fixes the text, but the leader and page numbers retain the Page Heading character style. 

The only way to resolve it is to select each of the lines and clear overrides from the paragraph style.  I have to go through this every time I update the toc.  Any ideas what is causing this or how to fix it?