diff --git a/spec/VISSv2_Core.html b/spec/VISSv2_Core.html
index 15451e2..d25e832 100644
--- a/spec/VISSv2_Core.html
+++ b/spec/VISSv2_Core.html
@@ -467,7 +467,7 @@ <h2>Error Information</h2>
       <section id="timestamp">
         <h2>Timestamps</h2>
         <p>
-           Timestamps in transport payloads MUST conform to the ISO8601 standard, using the UTC format with a trailing Z. 
+           Timestamps in transport payloads MUST conform to the [[ISO8601]] standard, using the UTC format with a trailing Z. 
            Time resolution SHALL at least be seconds, with subsecond resolution as an optional degree of precision when desired.
            The time and date format shall be as shown below, where the sub-second data and delimiter is optional.<br>
            YYYY-MM-DDTHH:MM:SS.ssssssZ<br>
@@ -711,7 +711,8 @@ <h2>Change Filter Operation</h2>
                 (**)The supported logic operators are ["eq", "ne", "gt", "gte", "lt", "lte"], 
                 where "eq" is "equal", "ne" is "not equal", "gt" is "greater than", "gte" is "greater than or equal", 
                 "lt" is "less than", "lte" is "less than or equal".<br>
-                Examples can be found in the [[viss2-transport]] specification.
+                Example can be found in the <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-transport/#change-subscribe">Change Subscribe</a>
+                 in [[viss2-transport]] specification.
                </p>
         </section>
  
@@ -767,7 +768,7 @@ <h2>Dynamic Metadata Filter Operation</h2>
         The response uses the same syntax as for ordinary data responses, with "value" representing the validate tag. 
         The server applies the validate data according to the inheritance rules described in the access control selection chapter.</li>
         <li><u>server_capabilities</u>: The capabilities that the server supports. 
-        See Appendix: Server Capabilities for how this is expressed in the response.</li>
+        See <a href="#server-capabilities">B. Server Capabilities</a> for how this is expressed in the response.</li>
         </ul>
         A dynamic metadata request can be combined with a paths filter operation to address multiple nodes, 
         but not with any other filter type.<br>
diff --git a/spec/VISSv2_Transport.html b/spec/VISSv2_Transport.html
index b8173bb..c1ee2ac 100644
--- a/spec/VISSv2_Transport.html
+++ b/spec/VISSv2_Transport.html
@@ -515,7 +515,7 @@ <h2>Dynamic Metadata Read</h2>
             <p>
               The dynamic metadata, i. e. any other metadata kept by the vehicle system, 
               is retrieved by the setting the "type" to  "dynamic-metadata".
-              The value MUST be set to one of the domain names as specified in the [[viss2-core]], Dynamic Metadata Filter Operation chapter.
+              The value MUST be set to one of the domain names as specified in the [[viss2-core]], <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-core/#dynamic-metadata-request">Dynamic Metadata Filter Operation</a> chapter.
               <br>
               <b>Example:</b>
               Request:
@@ -1202,7 +1202,8 @@ <h2>Authorized Subscribe</h2>
             <h2>Curve Logging Subscribe</h2>
             <p>
             Curve logging data compression by eliminating data points that are within a set error margin is activated via a subscription request. 
-            Notifications will be issued when the buffer becomes full, after insignificant data points have been eliminated.
+            Notifications will be issued when the buffer becomes full, after insignificant data points have been eliminated, 
+            refer the <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-core/#curvelog-filter-operation">Curve logging Filter Operation</a> chapter in the [[viss2-core]] documentation.
             </p>
             <p>
               <b>Example:</b><br>
@@ -1242,7 +1243,7 @@ <h2>Curve Logging Subscribe</h2>
             <h2>Range Subscribe</h2>
             <p>
             Subscription to a range of values, that can have either a single boundary, or multipe boundaries as in the example below. 
-            For a more information how to use range of values, refer the Range Filter Operation chapter in the [[viss2-core]] documentation.
+            For a more information how to use range of values, refer the <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-core/#range-filter-operation">Range Filter Operation</a> chapter in the [[viss2-core]] documentation.
             </p>
             <p>
               <b>Example:</b><br>
@@ -1281,7 +1282,7 @@ <h2>Range Subscribe</h2>
             <h2>Change Subscribe</h2>
             <p>
             Subscription to when a signal has changed between two sequential captures. 
-            For a more information how to use change of values, refer the Change Filter Operation chapter in the [[viss2-core]] documentation.
+            For a more information how to use change of values, refer the <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-core/#change-filter-operation">Change Filter Operation</a> chapter in the [[viss2-core]] documentation.
             </p>
             <p>
               <b>Example:</b><br>