--- old/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java	2020-01-07 15:25:46.000000000 +0100
+++ new/test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java	2020-01-07 15:25:46.000000000 +0100
@@ -63,67 +63,67 @@
 
         checkOrder("mymodule/mypackage/MyAnnotation.html",
                    "<h1 title=\"Annotation Type MyAnnotation\" class=\"title\">Annotation Type MyAnnotation</h1>",
-                   "(annotation) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(annotation) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Element Details</h2>",
-                   "(annotation/method) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(annotation/method) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/mypackage/MyClass.html",
                    "<h1 title=\"Class MyClass\" class=\"title\">Class MyClass</h1>",
-                   "(class) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(class) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Field Details</h2>",
-                   "(class/field) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
-                   "(class/static-field) the <code><a id=\"test.property-2\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(class/field) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
+                   "(class/static-field) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Constructor Details</h2>",
-                   "(class/constructor) the <code><a id=\"test.property-3\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(class/constructor) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Method Details</h2>",
-                   "(class/static-method) the <code><a id=\"test.property-4\" class=\"searchTagResult\">test.property</a></code> system property.",
-                   "(class/method) the <code><a id=\"test.property-5\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(class/static-method) the <code><span id=\"test.property-4\" class=\"searchTagResult\">test.property</span></code> system property.",
+                   "(class/method) the <code><span id=\"test.property-5\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/mypackage/MyEnum.html",
                    "<h1 title=\"Enum MyEnum\" class=\"title\">Enum MyEnum</h1>",
-                   "(enum) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(enum) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Enum Constant Details</h2>",
-                   "(enum/constant) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(enum/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/mypackage/MyError.html",
                    "<h1 title=\"Class MyError\" class=\"title\">Class MyError</h1>",
-                   "(error) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(error) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Constructor Details</h2>",
-                   "(error/constructor) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(error/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/mypackage/MyException.html",
                    "<h1 title=\"Class MyException\" class=\"title\">Class MyException</h1>",
-                   "(exception) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(exception) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Constructor Details</h2>",
-                   "(exception/constructor) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code>",
+                   "(exception/constructor) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code>",
                    "");
 
         checkOrder("mymodule/mypackage/MyInterface.html",
                    "<h1 title=\"Interface MyInterface\" class=\"title\">Interface MyInterface</h1>",
-                   "(interface) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(interface) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Field Details</h2>",
-                   "(interface/constant) the <code><a id=\"test.property-1\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(interface/constant) the <code><span id=\"test.property-1\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "<h2>Method Details</h2>",
-                   "(interface/method-1) the <code><a id=\"test.property-2\" class=\"searchTagResult\">test.property</a></code> system property.",
-                   "(interface/method-2) the <code><a id=\"test.property-3\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(interface/method-1) the <code><span id=\"test.property-2\" class=\"searchTagResult\">test.property</span></code> system property.",
+                   "(interface/method-2) the <code><span id=\"test.property-3\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/module-summary.html",
                    "<h1 title=\"Module\" class=\"title\">Module&nbsp;mymodule</h1>",
-                   "(module) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(module) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("mymodule/mypackage/package-summary.html",
                    "<h1 title=\"Package\" class=\"title\">Package&nbsp;mypackage</h1>",
-                   "(package) the <code><a id=\"test.property\" class=\"searchTagResult\">test.property</a></code> system property.",
+                   "(package) the <code><span id=\"test.property\" class=\"searchTagResult\">test.property</span></code> system property.",
                    "");
 
         checkOrder("index-all.html",
-                   "<h2 class=\"title\">T</h2>",
+                   "<h2 class=\"title\" id=\"I:T\">T</h2>",
                    "<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyAnnotation.html#test.property\">test.property</a></span>" +
                            " - Search tag in annotation type mypackage.MyAnnotation</dt>\n<dd>System Property</dd>",
                    "<dt><span class=\"searchTagLink\"><a href=\"mymodule/mypackage/MyClass.html#test.property\">test.property</a></span>" +