Quick thought, add a test for the row in the table header template match, i.e changing

xsl:template match="oh"

to

xsl:template match="oh/q"

will eliminate the header for the "oh" if there are no "q" elements in the XML

😎

Edit: tidy up 😉