Tweak kws html format to match output of old format

23 files changed, 96 insertions, 68 deletions

diff --git a/core/testdata/format/classWithCompanionObject.html b/core/testdata/format/classWithCompanionObject.html
index 4a9d143a..2954d5a7 100644
--- a/core/testdata/format/classWithCompanionObject.html
+++ b/core/testdata/format/classWithCompanionObject.html
@@ -13,7 +13,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-klass/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-klass/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Klass</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
 </tr>
@@ -24,7 +25,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-klass/x">x</a></td>
+<p><a href="test/-klass/x">x</a></p>
+</td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">x</span><span class="symbol">: </span><span class="identifier">Int</span></code></td>
 </tr>
@@ -35,7 +37,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-klass/foo">foo</a></td>
+<p><a href="test/-klass/foo">foo</a></p>
+</td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
index 3cf9be00..42f21d3c 100644
--- a/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
+++ b/core/testdata/format/crossLanguage/kotlinExtendsJava/Bar.html
@@ -14,7 +14,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/test/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/test/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>See <a href="test/test/-foo/xyzzy">xyzzy</a></p>
@@ -27,7 +28,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/test/-foo/xyzzy">xyzzy</a></td>
+<p><a href="test/test/-foo/xyzzy">xyzzy</a></p>
+</td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">xyzzy</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/deprecated.package.html b/core/testdata/format/deprecated.package.html
index 739a84db..b85e53bd 100644
--- a/core/testdata/format/deprecated.package.html
+++ b/core/testdata/format/deprecated.package.html
@@ -12,7 +12,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-c/index">C</a></td>
+<p><a href="test/-c/index">C</a></p>
+</td>
 <td>
 <code><span class="keyword">class </span><s><span class="identifier">C</span></s></code></td>
 </tr>
@@ -23,7 +24,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/p">p</a></td>
+<p><a href="test/p">p</a></p>
+</td>
 <td>
 <code><span class="keyword">val </span><s><span class="identifier">p</span></s><span class="symbol">: </span><span class="identifier">Int</span></code></td>
 </tr>
@@ -34,7 +36,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/f">f</a></td>
+<p><a href="test/f">f</a></p>
+</td>
 <td>
 <code><span class="keyword">fun </span><s><span class="identifier">f</span></s><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/entity.html b/core/testdata/format/entity.html
index fe787a99..abe89502 100644
--- a/core/testdata/format/entity.html
+++ b/core/testdata/format/entity.html
@@ -14,7 +14,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Copyright &copy; JetBrains 2015 &#x22;</p>
diff --git a/core/testdata/format/javaLinkTag.html b/core/testdata/format/javaLinkTag.html
index 62fb6299..035bdd06 100644
--- a/core/testdata/format/javaLinkTag.html
+++ b/core/testdata/format/javaLinkTag.html
@@ -14,7 +14,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-foo/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Call <code><a href="test/-foo/bar">#bar()</a></code> to do the job.</p>
@@ -27,7 +28,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/bar">bar</a></td>
+<p><a href="test/-foo/bar">bar</a></p>
+</td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/javaLinkTagWithLabel.html b/core/testdata/format/javaLinkTagWithLabel.html
index 61302f82..69a15bc7 100644
--- a/core/testdata/format/javaLinkTagWithLabel.html
+++ b/core/testdata/format/javaLinkTagWithLabel.html
@@ -14,7 +14,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-foo/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Call <code><a href="test/-foo/bar">this wonderful method</a></code> to do the job.</p>
@@ -27,7 +28,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/bar">bar</a></td>
+<p><a href="test/-foo/bar">bar</a></p>
+</td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/javaSeeTag.html b/core/testdata/format/javaSeeTag.html
index 6044b60f..c81eec31 100644
--- a/core/testdata/format/javaSeeTag.html
+++ b/core/testdata/format/javaSeeTag.html
@@ -15,7 +15,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-foo/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Foo</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
 </tr>
@@ -26,7 +27,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-foo/bar">bar</a></td>
+<p><a href="test/-foo/bar">bar</a></p>
+</td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">bar</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/javaSupertype.html b/core/testdata/format/javaSupertype.html
index 89003291..b46c8e54 100644
--- a/core/testdata/format/javaSupertype.html
+++ b/core/testdata/format/javaSupertype.html
@@ -13,7 +13,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-c/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-c/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
 </tr>
@@ -24,7 +25,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-c/-bar/return-foo">returnFoo</a></td>
+<p><a href="test/-c/-bar/return-foo">returnFoo</a></p>
+</td>
 <td>
 <code><span class="keyword">open</span> <span class="keyword">fun </span><span class="identifier">returnFoo</span><span class="symbol">(</span><span class="identifier" id="C.Bar$returnFoo(C.Foo)/foo">foo</span><span class="symbol">:</span>&nbsp;<a href="test/-c/-foo/index"><span class="identifier">Foo</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="test/-c/-foo/index"><span class="identifier">Foo</span></a></code></td>
 </tr>
diff --git a/core/testdata/format/linkWithLabel.html b/core/testdata/format/linkWithLabel.html
index fbaecd2b..b8fe2228 100644
--- a/core/testdata/format/linkWithLabel.html
+++ b/core/testdata/format/linkWithLabel.html
@@ -14,7 +14,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Use <a href="test/-bar/foo">this method</a> for best results.</p>
@@ -27,7 +28,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-bar/foo">foo</a></td>
+<p><a href="test/-bar/foo">foo</a></p>
+</td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/linkWithStarProjection.html b/core/testdata/format/linkWithStarProjection.html
index 3e4e884b..bb9ce43c 100644
--- a/core/testdata/format/linkWithStarProjection.html
+++ b/core/testdata/format/linkWithStarProjection.html
@@ -13,7 +13,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-k-class-loader/foo">foo</a></td>
+<p><a href="test/-k-class-loader/foo">foo</a></p>
+</td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="identifier" id="KClassLoader$foo(kotlin.Enum(()))/c">c</span><span class="symbol">:</span>&nbsp;<span class="identifier">Enum</span><span class="symbol">&lt;</span><span class="identifier">*</span><span class="symbol">&gt;</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
 </tr>
diff --git a/core/testdata/format/orderedList.html b/core/testdata/format/orderedList.html
index fa24e080..66f37876 100644
--- a/core/testdata/format/orderedList.html
+++ b/core/testdata/format/orderedList.html
@@ -17,7 +17,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Usage instructions:</p>
diff --git a/core/testdata/format/overloads.html b/core/testdata/format/overloads.html
index 5e9bdbd3..d0f7f37d 100644
--- a/core/testdata/format/overloads.html
+++ b/core/testdata/format/overloads.html
@@ -12,7 +12,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/f">f</a></td>
+<p><a href="test/f">f</a></p>
+</td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.Int)/x">x</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.String)/x">x</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code>
diff --git a/core/testdata/format/overloadsWithDescription.html b/core/testdata/format/overloadsWithDescription.html
index fe98b8fe..eefa6976 100644
--- a/core/testdata/format/overloadsWithDescription.html
+++ b/core/testdata/format/overloadsWithDescription.html
@@ -14,7 +14,7 @@
 <p>Performs an action on <a href="test/f#$f(kotlin.Int)/x">x</a>.</p>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<p><a name="x"></a>
-<code>x</code> - the value to perform the action on.</p>
+<a name="x"></a>
+<code>x</code> - the value to perform the action on.
 </BODY>
 </HTML>
diff --git a/core/testdata/format/overloadsWithDifferentDescriptions.html b/core/testdata/format/overloadsWithDifferentDescriptions.html
index 947c72d6..cdf380be 100644
--- a/core/testdata/format/overloadsWithDifferentDescriptions.html
+++ b/core/testdata/format/overloadsWithDifferentDescriptions.html
@@ -7,21 +7,18 @@
 <a href="test/index">test</a>&nbsp;/&nbsp;<a href="test/f">f</a><br/>
 <br/>
 <h1>f</h1>
-<p><a name="$f(kotlin.Int)"></a>
+<a name="$f(kotlin.Int)"></a>
 <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.Int)/x">x</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code>
 <p>Performs an action on x.</p>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<p><a name="x"></a>
-<code>x</code> - the int value to perform the action on.</p>
-</p>
-<p><a name="$f(kotlin.String)"></a>
+<a name="x"></a>
+<code>x</code> - the int value to perform the action on.<a name="$f(kotlin.String)"></a>
 <code><span class="keyword">fun </span><span class="identifier">f</span><span class="symbol">(</span><span class="identifier" id="$f(kotlin.String)/x">x</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code>
 <p>Performs an action on x.</p>
 <p>This is a long description.</p>
 <h3>Parameters</h3>
-<p><a name="x"></a>
-<code>x</code> - the string value to perform the action on.</p>
-</p>
+<a name="x"></a>
+<code>x</code> - the string value to perform the action on.
 </BODY>
 </HTML>
diff --git a/core/testdata/format/parameterAnchor.html b/core/testdata/format/parameterAnchor.html
index ecb89fe6..aa51fff6 100644
--- a/core/testdata/format/parameterAnchor.html
+++ b/core/testdata/format/parameterAnchor.html
@@ -11,7 +11,7 @@
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span> <span class="identifier">processFiles</span><span class="symbol">(</span><span class="identifier" id="$processFiles(kotlin.Function0((processFiles.T)))/processor">processor</span><span class="symbol">:</span>&nbsp;<span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">T</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">List</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span></code>
 <p>Runs <a href="test/process-files#$processFiles(kotlin.Function0((processFiles.T)))/processor">processor</a> for each file and collects its results into single list</p>
 <h3>Parameters</h3>
-<p><a name="processor"></a>
-<code>processor</code> - function to receive context for symbol resolution and file for processing</p>
+<a name="processor"></a>
+<code>processor</code> - function to receive context for symbol resolution and file for processing
 </BODY>
 </HTML>
diff --git a/core/testdata/format/sinceKotlin.html b/core/testdata/format/sinceKotlin.html
index 4788fcda..ab25a002 100644
--- a/core/testdata/format/sinceKotlin.html
+++ b/core/testdata/format/sinceKotlin.html
@@ -15,7 +15,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-since1.1/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-since1.1/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Since1.1</span><span class="symbol">(</span><span class="symbol">)</span></code>
 <p>Useful</p>
diff --git a/core/testdata/format/typeLink.html b/core/testdata/format/typeLink.html
index ba42ef18..2e51863f 100644
--- a/core/testdata/format/typeLink.html
+++ b/core/testdata/format/typeLink.html
@@ -13,7 +13,8 @@
 <tbody>
 <tr>
 <td>
-<a href="test/-bar/-init-">&lt;init&gt;</a></td>
+<p><a href="test/-bar/-init-">&lt;init&gt;</a></p>
+</td>
 <td>
 <code><span class="identifier">Bar</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
 </tr>
diff --git a/core/testdata/format/website-html/dataTags/multiplatform.package.html b/core/testdata/format/website-html/dataTags/multiplatform.package.html
index 0430c6f2..15e1fc12 100644
--- a/core/testdata/format/website-html/dataTags/multiplatform.package.html
+++ b/core/testdata/format/website-html/dataTags/multiplatform.package.html
@@ -4,56 +4,64 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JVM" data-jre-version="JRE7"><td>
-<a href="test/foo/jre7">jre7</a>
+<p><a href="test/foo/jre7">jre7</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jre7</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM" data-kotlin-version="Kotlin 1.1" data-jre-version="JRE7"><td>
-<a href="test/foo/jre7-new">jre7New</a>
+<p><a href="test/foo/jre7-new">jre7New</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jre7New</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JS"><td>
-<a href="test/foo/js">js</a>
+<p><a href="test/foo/js">js</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">js</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JS" data-kotlin-version="Kotlin 1.1"><td>
-<a href="test/foo/js-new">jsNew</a>
+<p><a href="test/foo/js-new">jsNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jsNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM"><td>
-<a href="test/foo/jvm">jvm</a>
+<p><a href="test/foo/jvm">jvm</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jvm</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM" data-kotlin-version="Kotlin 1.1"><td>
-<a href="test/foo/jvm-new">jvmNew</a>
+<p><a href="test/foo/jvm-new">jvmNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">jvmNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM, JS" data-jre-version="JRE7"><td>
-<a href="test/foo/shared">shared</a>
+<p><a href="test/foo/shared">shared</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">shared</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM, JS" data-kotlin-version="Kotlin 1.1" data-jre-version="JRE7"><td>
-<a href="test/foo/shared-new">sharedNew</a>
+<p><a href="test/foo/shared-new">sharedNew</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">sharedNew</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
index bca7d36d..35773561 100644
--- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
+++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.html
@@ -1,17 +1,17 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/pack/index">pack</a> / <a href="test/pack/-some/index">Some</a></div>
 <h1>Some</h1>
-<p><div class="overload-group" data-platform="JVM"><div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
+<div class="overload-group" data-platform="JVM"><div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
 <p><strong>Platform and version requirements:</strong> JVM</p>
 </div>
-</p>
-<p><div class="overload-group" data-platform="JS"><div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
+<div class="overload-group" data-platform="JS"><div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
 <p><strong>Platform and version requirements:</strong> JS</p>
-<p>Constructors</p>
+<h3>Constructors</h3>
 <table class="api-docs-table">
 <tbody>
 <tr>
 <td>
-<a href="test/pack/-some/-some/-init-">&lt;init&gt;</a>
+<p><a href="test/pack/-some/-some/-init-">&lt;init&gt;</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="identifier">Some</span><span class="symbol">(</span><span class="symbol">)</span></code></div>
@@ -20,12 +20,13 @@
 </tr>
 </tbody>
 </table>
-<p>Functions</p>
+<h3>Functions</h3>
 <table class="api-docs-table">
 <tbody>
 <tr>
 <td>
-<a href="test/pack/-some/-some/magic">magic</a>
+<p><a href="test/pack/-some/-some/magic">magic</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></div>
@@ -35,4 +36,3 @@
 </tbody>
 </table>
 </div>
-</p>
diff --git a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
index 985f9f04..15ae2a5b 100644
--- a/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
+++ b/core/testdata/format/website-html/dataTagsInGroupNode/multiplatform.package.html
@@ -4,14 +4,16 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JS"><td>
-<a href="test/pack/-some/index">Some</a>
+<p><a href="test/pack/-some/index">Some</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">class </span><span class="identifier">Some</span></code></div>
 
 </td>
 </tr><tr data-platform="JVM"><td>
-<a href="test/pack/-some-cool-jvm-class/index">SomeCoolJvmClass</a>
+<p><a href="test/pack/-some-cool-jvm-class/index">SomeCoolJvmClass</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">class </span><span class="identifier">SomeCoolJvmClass</span></code></div>
@@ -23,7 +25,8 @@
 <table class="api-docs-table">
 <tbody>
 <tr data-platform="JVM"><td>
-<a href="test/pack/-some/index">Some</a>
+<p><a href="test/pack/-some/index">Some</a></p>
+
 </td>
 <td>
 <div class="signature"><code><span class="keyword">typealias </span><span class="identifier">Some</span>&nbsp;<span class="symbol">=</span>&nbsp;<span class="identifier">SomeCoolJvmClass</span></code></div>
diff --git a/core/testdata/format/website-html/overloadGroup.html b/core/testdata/format/website-html/overloadGroup.html
index 2482f8fb..3ea7de94 100644
--- a/core/testdata/format/website-html/overloadGroup.html
+++ b/core/testdata/format/website-html/overloadGroup.html
@@ -1,18 +1,16 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/magic">magic</a></div>
 <h1>magic</h1>
-<p><div class="overload-group"><a name="$magic(kotlin.String)"></a>
+<div class="overload-group"><a name="$magic(kotlin.String)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.String)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
-<p>Parameters</p>
+<h3>Parameters</h3>
 <p><a name="spell"></a>
 <code>spell</code> - The text of spell, often distributed on scrolls</p>
-<p><strong>Return</strong>Spell ID for future casts</p>
+<p><strong>Return</strong> Spell ID for future casts</p>
 </div>
-</p>
-<p><div class="overload-group"><a name="$magic(kotlin.Int)"></a>
+<div class="overload-group"><a name="$magic(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">magic</span><span class="symbol">(</span><span class="parameterName" id="$magic(kotlin.Int)/spell">spell</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
-<p>Parameters</p>
+<h3>Parameters</h3>
 <p><a name="spell"></a>
 <code>spell</code> - Spell ID of previously casted spell</p>
-<p><strong>Return</strong>Spell ID for future casts</p>
+<p><strong>Return</strong> Spell ID for future casts</p>
 </div>
-</p>
diff --git a/core/testdata/format/website-html/returnTag.html b/core/testdata/format/website-html/returnTag.html
index 92253130..d4190fa1 100644
--- a/core/testdata/format/website-html/returnTag.html
+++ b/core/testdata/format/website-html/returnTag.html
@@ -6,4 +6,4 @@
 <h3>Parameters</h3>
 <p><a name="ignoreCase"></a>
 <code>ignoreCase</code> - <code>true</code> to ignore character case when matching a character. By default <code>false</code>.</p>
-<p><strong>Returns</strong>An index of the first occurrence of <a href="test/index-of#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</a> or -1 if none is found.</p>
+<p><strong>Returns</strong> An index of the first occurrence of <a href="test/index-of#$indexOf(Foo, kotlin.Char, kotlin.Int, kotlin.Boolean)/char">char</a> or -1 if none is found.</p>
diff --git a/core/testdata/format/website-html/sample.html b/core/testdata/format/website-html/sample.html
index 00646a11..55d321c0 100644
--- a/core/testdata/format/website-html/sample.html
+++ b/core/testdata/format/website-html/sample.html
@@ -1,6 +1,6 @@
 <div class='api-docs-breadcrumbs'><a href="test/index">test</a> / <a href="test/foo">foo</a></div>
 <h1>foo</h1>
-<p><div class="overload-group"><a name="$foo()"></a>
+<div class="overload-group"><a name="$foo()"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 <p>Groups elements of the original sequence by the key returned by the given <a href="#">keySelector</a> function
 applied to each element and returns a map where each group key is associated with a list of corresponding elements.</p>
@@ -14,8 +14,6 @@ if (true) {
 //sampleEnd
 }</code></pre></div>
 </div>
-</p>
-<p><div class="overload-group"><a name="$foo(kotlin.Int)"></a>
+<div class="overload-group"><a name="$foo(kotlin.Int)"></a>
 <div class="signature"><code><span class="keyword">fun </span><span class="identifier">foo</span><span class="symbol">(</span><span class="parameterName" id="$foo(kotlin.Int)/i">i</span><span class="symbol">:</span>&nbsp;<span class="identifier">Int</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Int</span></code></div>
 </div>
-</p>