Keeping the Clauses and Section Headings in Same Page

Dear Experts,

I have been experimenting in Repository Contracts to keep the Clauses and Section titles in the same page, yet allowing the Clause text to flow across pages.

I am aware that there is an enhancement request for this issue in Metalink however, trying to use the keep-with-next.within-page="always", does not seem to work.

I have tried with multiple options yet I am unable to resolve this in the following code:

<xsl:template match="SectionsArticlesToPrintVORow" mode="terms">
        <xsl:if test="$OkcTermsMode = 'WML' and position()=(last()-1)">
            <xsl:text disable-output-escaping="yes">&lt;TERMS/&gt;</xsl:text>
            <xsl:call-template name="SetMetaData"/>
        </xsl:if>
        <xsl:choose>
            <xsl:when test="AmendOperationCode='DELETED'">

     </xsl:when>
            <xsl:otherwise>
                <!--fo:table-row keep-with-next.within-page="always">
                    <fo:table-cell padding-top="12pt" padding-bottom="3pt"-->
                     <!-- Changes for page breaks after Sections Begins -->
                    <!--     <xsl:if test="(ObjectType='ARTICLE') and (DisplayOrder=00001)">
                            <fo:block break-before="page" />
                        </xsl:if> -->
                        <xsl:if test="$OkcTermsMode = 'WML'">
                            <!--Marking the start of Label-->
                            <xsl:text disable-output-escaping="yes">&lt;LabelTitleStart</xsl:text>
                             <!--Unique Id-->
                             <xsl:text disable-output-escaping="yes"> TitleUniqueId="</xsl:text>
                                                <xsl:value-of select="UniqueId" />                            
                          <xsl:text disable-output-escaping="yes">"/&gt;</xsl:text>                        
                        </xsl:if>    

                      <xsl:if test="$OkcTermsMode = 'WML'">                      
                          <xsl:if test="ObjectType='SECTION'">
                              <!--Marking the start of Sections-->
                              <xsl:text disable-output-escaping="yes">&lt;SectionStartTag</xsl:text>

                              <!--Set the parameters for Sections-->
                              <xsl:call-template name="SetCommonParameters"/>

                              <xsl:text disable-output-escaping="yes">" /&gt;</xsl:text>                                                                                                
                          </xsl:if>
                      </xsl:if>
                    
<!-- CSR Center align of