diff --git a/wiki/Documentation.md b/wiki/Documentation.md
index 6c5c69dc..8ce30c26 100644
--- a/wiki/Documentation.md
+++ b/wiki/Documentation.md
@@ -20,6 +20,7 @@ The framework also provides a router component to help dispatching the incoming
 A service can be a web api, a web interface, … what ever run on top of HTTP.
 
 <a name="wiki-service"></a>
+<a name="service"></a>
 # Service
 > see interface: **WSF_SERVICE** 
 
@@ -34,6 +35,7 @@ For convenience, the framework provides richer service interface that handles th
 > [Learn more about service](Documentation__Service)
 
 <a name="wiki-request"></a><a name="wiki-response"></a><a name="wiki-request-and-response"></a>
+<a name="request"></a><a name="response"></a><a name="request-and-response"></a>
 # Request and Response
 > see interface: **WSF_REQUEST** and **WSF_RESPONSE** 
 
@@ -56,6 +58,7 @@ The **WSF_RESPONSE** represents the communication toward the client, a service n
 > [Learn more about request](Documentation__Request) and [about response](Documentation__Response)
 
 <a name="wiki-connector"></a>
+<a name="connector"></a>
 # Connectors: 
 > see **WGI_CONNECTOR**
 
@@ -71,6 +74,7 @@ It is fairly easy to add new connector, it just has to follow the EWSGI interfac
 > [Learn more about connector](Documentation__Connector)
 
 <a name="wiki-router"></a>
+<a name="router"></a>
 # Router or Request Dispatcher:
 > Routes HTTP requests to the proper execution code
 
@@ -171,9 +175,11 @@ examples
 
 
 <a name="wiki-EWSGI"></a>
+<a name="EWSGI"></a>
 # EWSGI Specification
 
 <a name="wiki-libraries"></a>
+<a name="libraries"></a>
 # Libraries 
 
 External libraries are included, such as Cypress OAuth (Security), HTML parsing library, Template Engine Smarty.