Q&A sets within an article: How to insert QandASet title to the article TOC

Hi list,

my problem is as in the message subject.

I have an article, like below:

<article class="faq">
    <articleinfo>
        <title>FAQ</title>
        <subtitle>something</subtitle>

        <releaseinfo>Release number</releaseinfo>
    </articleinfo>
    <xi:include href=""qa1.xml"/>    <xi:include href=""qa2.xml"/>    <xi:include href="""
qa3.xml"/>
</article>

Each XIncluded file is a QandASet, like the following:

<qandaset id="general_security">
    <title>Security issues</title>
    <qandaentry id="forgot_pwd">

        <question>
            <para>I forgot my password. How can I retrieve it?</para>
        </question>
        <answer><para>The answer is...</para>
        </answer>

    </qandaentry>
</qandaset>

How do I define my customization layer to have the HTML output similar to the following?

FAQ
something
Release number
-------------------------------

Table of Contents

Security issues
QASet2 title
QASet3 title

--------------------------------
Security issues
1. I forgot my password. How can I retrieve it?
2. Q2

QASet2 title

1. Q1

2. Q2

QASet3 title
1. Q1

2. Q2

I have set <xsl:param name="generate.toc">article toc,title qandaset toc</xsl:param>, but it does not work. That is, questions are listed within each Q&ASet but I do not see article's ToC.

I can accept the following output or any combination of it that will provide the article ToC:

FAQ

something

Release number

-------------------------------

Table of Contents

Security issues
    1. I forgot my password. How can I retrieve it?
    2. Q2

QASet2 title
    1. Q1
    2. Q2

QASet3 title
    1. Q1
    2. Q2
--------------------------------
Security issues

1. I forgot my password. How can I retrieve it?

2. Q2

QASet2 title

1. Q1

2. Q2

QASet3 title

1. Q1

2. Q2

Thanks in advance,

-Zbyszek