Table of Contents, Separating Headings and Page Numbers

Hi,

I'm working with a table of contents in InDesign CC. Some of the headings that are included in the table will be very long and wrap to the next line. I want it to wrap before it hits the right indent tab so that there is some visual separation between the page numbers and any text. I understand I can do this manually, but I want to do it systematically as this is a template for a large number of documents.

Here is what I want it to look like, the important part being that the long heading:

1. Regular Heading......................................................5

    1.1  Regular sub-heading.........................................6

2. Long Heading that hopefully

    a smart person would cut

    down anyway............................................................8

As opposed to:

1.      Regular Heading......................................................5

    1.1       Regular sub-heading.........................................6

2.      Long Heading that hopefullya smart person would

          cut down anyway.....................................................8

Any ideas? Is there a way to have an active table of contents in a table? Or perhaps something else? Span across a second column?