{toc} macro in preview and variable insertion for global templates shows wrong headlines

Hi,

we use several global templates throughout all the confluence spaces and recognized an error in the

{toc} macro for these global templates. Steps to (hopefully) reproduce this problem:

* In the administration interface, global templates, click add template.
* enter a {toc}

macro on ton, some headlines, some text, and some variable fields inside the headlines into the body of template A).

• press preview. The preview works, but the {toc} marco fails, which is not nice but not the problem here.
  * press save.
  * Add another global template B) with a {toc}

  macro, and some headlines/text/whatever.

• Press preview.
• Now, in the preview you should see the generated TOC content of template A), not B), as I would expect.

This wrong TOC content is also display when I use template B) to create a page. As variables are included in headlines, confluence also expects the user to fill in the variables in the headlines inside the TOC, which aren't even there to fill anything in template B).