diff --git a/classes/modules/serviceModule.php b/classes/modules/serviceModule.php
index 99aa3147403bc59288e91b3413a28616a583d8a2..642edc468b4e25f5816992a7e337189509fa571e 100644
--- a/classes/modules/serviceModule.php
+++ b/classes/modules/serviceModule.php
@@ -111,7 +111,8 @@ class ServiceModule extends abstractModule{
   	  $lodspk['ns'] = $conf['ns'];  	  	
   	  $lodspk['this']['value'] = $uri;
   	  $lodspk['this']['curie'] = Utils::uri2curie($uri);
-  	  $lodspk['this']['local'] = $localUri;  	
+  	  $lodspk['local']['value'] = $localUri;
+  	  $lodspk['local']['curie'] = Utils::uri2curie($localUri);
   	  $lodspk['contentType'] = $acceptContentType;
   	  $lodspk['endpoint'] = $conf['endpoint'];
   	  
diff --git a/classes/modules/sparqlFilterModule.php b/classes/modules/sparqlFilterModule.php
index d532377b24012619b338cab820deb0cb367dd90c..99f89f6f5977785c351f54760a9b350be8a02409 100644
--- a/classes/modules/sparqlFilterModule.php
+++ b/classes/modules/sparqlFilterModule.php
@@ -107,7 +107,8 @@ public function execute($pair){
   	$lodspk['add_mirrored_uris'] = true;
   	$lodspk['this']['value'] = $uri;
   	$lodspk['this']['curie'] = Utils::uri2curie($uri);
-  	$lodspk['this']['local'] = $localUri;
+  	$lodspk['local']['value'] = $localUri;
+  	$lodspk['local']['curie'] = Utils::uri2curie($localUri);
    	$lodspk['this']['extension'] = $extension;
   	//chdir($conf['home'].$conf['model']['directory']);
   	
diff --git a/classes/modules/staticModule.php b/classes/modules/staticModule.php
index c1c24130c186943bc2290d97a0883045ec041e9c..2e8c71b69e8df40073d195b75c02d1c47767af23 100644
--- a/classes/modules/staticModule.php
+++ b/classes/modules/staticModule.php
@@ -40,7 +40,8 @@ class StaticModule extends abstractModule{
 	    $lodspk['ns'] = $conf['ns'];  	  	
 	    $lodspk['this']['value'] = $localUri;
 	    $lodspk['this']['curie'] = Utils::uri2curie($localUri);
-	    $lodspk['this']['local'] = $localUri;  	
+  	  $lodspk['local']['value'] = $localUri;
+  	  $lodspk['local']['curie'] = Utils::uri2curie($localUri);
 	    $lodspk['contentType'] = $acceptContentType;
 	    $lodspk['endpoint'] = $conf['endpoint'];	    
 	    $lodspk['type'] = $modelFile;
diff --git a/classes/modules/typeModule.php b/classes/modules/typeModule.php
index 5bf22e26b1df316b790293e9bd89f7c278785dfb..e1994c02ec7cf105850ba420c97b683249a646d9 100644
--- a/classes/modules/typeModule.php
+++ b/classes/modules/typeModule.php
@@ -82,7 +82,8 @@ class TypeModule extends abstractModule{
   	$lodspk['add_mirrored_uris'] = true;
   	$lodspk['this']['value'] = $uri;
   	$lodspk['this']['curie'] = Utils::uri2curie($uri);
-  	$lodspk['this']['local'] = $localUri;
+  	$lodspk['local']['value'] = $localUri;
+  	$lodspk['local']['curie'] = Utils::uri2curie($localUri);
    	$lodspk['this']['extension'] = $extension;
   	//chdir($conf['home'].$conf['model']['directory']);
   	
diff --git a/doc/examples/originalComponents/services/classes/html.template b/doc/examples/originalComponents/services/classes/html.template
index 40a25f4780dcfda40091049e0491878802e1427c..329366f01c3b599970b00fe6ce8c26500b9c299d 100644
--- a/doc/examples/originalComponents/services/classes/html.template
+++ b/doc/examples/originalComponents/services/classes/html.template
@@ -7,10 +7,10 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <style>
       body {
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
diff --git a/doc/examples/originalComponents/services/instances/html.template b/doc/examples/originalComponents/services/instances/html.template
index c0ec21f735b620e8171b59755fcaf2d926890aee..473e22eb40bffeab1edd7bff268f1bc7c0940b7a 100644
--- a/doc/examples/originalComponents/services/instances/html.template
+++ b/doc/examples/originalComponents/services/instances/html.template
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
     <style>
       body {
diff --git a/doc/examples/originalComponents/services/namedGraphs/html.template b/doc/examples/originalComponents/services/namedGraphs/html.template
index 3deff84eb5c6b1128b1d1bfc1a3a7262f19362ea..b1302cc547187bd4bd5545343835f8b378a82c3a 100644
--- a/doc/examples/originalComponents/services/namedGraphs/html.template
+++ b/doc/examples/originalComponents/services/namedGraphs/html.template
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
     <style>
       body {
diff --git a/doc/examples/originalComponents/types/rdfs:Resource/html.template b/doc/examples/originalComponents/types/rdfs:Resource/html.template
index 78b801094802107135065991e13c8e169443d9f3..49d83f5d9c2f5188181cb8f6828017e86e9099bf 100644
--- a/doc/examples/originalComponents/types/rdfs:Resource/html.template
+++ b/doc/examples/originalComponents/types/rdfs:Resource/html.template
@@ -7,10 +7,10 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <style>
       body {
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
diff --git a/utils/modules/service-view.inc b/utils/modules/service-view.inc
index 89e4d58a83f2c1394277ce4545f1ee00d6d1b6c0..0c253d024022f17aff19c0f82d7cb55599f64796 100644
--- a/utils/modules/service-view.inc
+++ b/utils/modules/service-view.inc
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <link href="css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
     <style>
       body {
diff --git a/utils/modules/type-view.inc b/utils/modules/type-view.inc
index 3cde72894588544451badde4b94ef0567eb43664..0ddb4ff506bc8140c566a4a11d25fb6c2cea9a43 100644
--- a/utils/modules/type-view.inc
+++ b/utils/modules/type-view.inc
@@ -6,10 +6,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.this.value}}.rdf" />
-    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.this.value}}.ttl" />
-    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.this.value}}.nt" />
-    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.this.value}}.json" />
+    <link rel="alternate" type="application/rdf+xml" title="RDF/XML Version" href="{{lodspk.local.value}}.rdf" />
+    <link rel="alternate" type="text/turtle" title="Turtle Version" href="{{lodspk.local.value}}.ttl" />
+    <link rel="alternate" type="text/plain" title="N-Triples Version" href="{{lodspk.local.value}}.nt" />
+    <link rel="alternate" type="application/json" title="RDFJSON Version" href="{{lodspk.local.value}}.json" />
     <link href="{{lodspk.home}}css/bootstrap.min.css" rel="stylesheet" type="text/css" media="screen" />
     <style>
       body {