Niggly formatting issues on a table of contents.

I’m creating a table of contents using my heading styles as the basis for the entries. I have 7 layers of headings in my document, and am using all 7 as the selection parameter for my contents entries. For each heading layer, I’ve inserted a tab-stop for each entry which progressively indents by .1" for each heading level, so that nested concepts are visually identifiable. However, I’m having some formatting issues:

  1. When the text of an entry wraps to a second line in the table, it aligns with the far left margin rather than with the text in the first line of the entry. In the body of my document all of the headings that wrap align with the text in the first line. I’ve compared the heading styles to the contents styles and cannot see any difference in the settings that would prevent the contents entries from aligning properly; I’ve also tried applying the heading styles to the contents to see if this would fix the issue and it does not.

  2. On some, but not all, table entries where the entry wraps to a second line in the table, the page number does not align to the right margin and/or the dot fill from the last word to the page number does not appear. This seems to happen when only the page number, or a very short word and the page number, wrap to the second line. I’ve tried manually editing these individual entries and in some, but not all, if I insert spaces on the first line to run another word to the second line the page number and dot fill will appear properly (but will disappear if I remove the spaces again). Adding spaces on the first line does not always fix the issue.

Any suggestions would be appreciated.