Selecting elements with param, but still included in x

The following is just a portion of a longer template.  I have varying levels
of <step> elements with potential customer and assembly attributes. I select
the <step>s I want, then need to create the variable "id" and number the
steps in my table -- applying numbers ONLY to those <step>s selected with
the IF test.


With the following structure, the numbering includes the "unseen" but not
selected elements. How can I do this please?

Thanks, Kat

<xsl:if test="(not(@customer) or (@customer=$customer)) and
	(not(@assembly) or (@assembly=$assembly))">
                   <xsl:variable name="id">
		<xsl:number level="multiple" count="step" format="1.1"/>
	      </xsl:variable>
	<table width="100%" border="0" cellpadding="0">
                   <tr>
		<td valign="top">
			<xsl:number level="multiple" count="step"
format="1.1"/>
		                   <xsl:if test="not(ancestor::step)">
			            <xsl:text>.</xsl:text>
			       </xsl:if>
		</td>
	      <td><xsl:apply-templates select="*[not(self::substeps)]"/>
	     </td></tr>
	ETC...


 XSL-List info and archive:  http://www.mulberrytech.com/xsl/xsl-list