diff --git a/tests/src/test/resources/kg/views/composite/composite-view-include-context.json b/tests/src/test/resources/kg/views/composite/composite-view-include-context.json
index 6afe1aeafe..f47525b2e8 100644
--- a/tests/src/test/resources/kg/views/composite/composite-view-include-context.json
+++ b/tests/src/test/resources/kg/views/composite/composite-view-include-context.json
@@ -80,7 +80,7 @@
         },
         "dynamic": false
       },
-      "query": "prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { {resource_id}   music:name       ?bandName ; music:genre      ?bandGenre ; music:album      ?albumId . ?albumId        music:released   ?albumReleaseDate ; music:song       ?songId . ?songId         music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } WHERE { {resource_id}   music:name       ?bandName ; music:genre      ?bandGenre . OPTIONAL { {resource_id} ^music:by        ?albumId . ?albumId        music:released   ?albumReleaseDate . OPTIONAL {?albumId         ^music:on        ?songId . ?songId          music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } } } ORDER BY(?songNumber)",
+      "query": "prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { ?id   music:name       ?bandName ; music:genre      ?bandGenre ; music:album      ?albumId . ?albumId        music:released   ?albumReleaseDate ; music:song       ?songId . ?songId         music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } WHERE { VALUES ?id { {resource_id} }. ?id   music:name       ?bandName ; music:genre      ?bandGenre . OPTIONAL { ?id ^music:by        ?albumId . ?albumId        music:released   ?albumReleaseDate . OPTIONAL {?albumId         ^music:on        ?songId . ?songId          music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } } } ORDER BY(?songNumber)",
       "context": {
         "@base": "https://music.example.com/",
         "@vocab": "https://music.example.com/"
@@ -121,7 +121,7 @@
         },
         "dynamic": false
       },
-      "query": "prefix xsd: <http://www.w3.org/2001/XMLSchema#> prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { {resource_id}             music:name               ?albumTitle ; music:length             ?albumLength ; music:numberOfSongs      ?numberOfSongs } WHERE {SELECT ?albumReleaseDate ?albumTitle (sum(xsd:integer(?songLength)) as ?albumLength) (count(?albumReleaseDate) as ?numberOfSongs) WHERE {OPTIONAL { {resource_id}           ^music:on / music:length   ?songLength } {resource_id} music:released             ?albumReleaseDate ; music:title                ?albumTitle . } GROUP BY ?albumReleaseDate ?albumTitle }",
+      "query": "prefix xsd: <http://www.w3.org/2001/XMLSchema#> prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { ?id             music:name               ?albumTitle ; music:length             ?albumLength ; music:numberOfSongs      ?numberOfSongs } WHERE { SELECT ?albumReleaseDate ?albumTitle (sum(xsd:integer(?songLength)) as ?albumLength) (count(?albumReleaseDate) as ?numberOfSongs) WHERE { VALUES ?id { {resource_id} }. OPTIONAL { ?id           ^music:on / music:length   ?songLength } ?id music:released             ?albumReleaseDate ; music:title                ?albumTitle . } GROUP BY ?albumReleaseDate ?albumTitle }",
       "context": {
         "@base": "https://music.example.com/",
         "@vocab": "https://music.example.com/"
diff --git a/tests/src/test/resources/kg/views/composite/composite-view.json b/tests/src/test/resources/kg/views/composite/composite-view.json
index ca58a21487..9f4364f76b 100644
--- a/tests/src/test/resources/kg/views/composite/composite-view.json
+++ b/tests/src/test/resources/kg/views/composite/composite-view.json
@@ -80,7 +80,7 @@
         },
         "dynamic": false
       },
-      "query": "prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { ?id   music:name       ?bandName ; music:genre      ?bandGenre ; music:album      ?albumId . ?albumId        music:released   ?albumReleaseDate ; music:song       ?songId . ?songId         music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } WHERE { VALUES ?id { {resource_id} }.  ?id music:name       ?bandName ; music:genre      ?bandGenre . OPTIONAL { ?id ^music:by        ?albumId . ?albumId        music:released   ?albumReleaseDate . OPTIONAL {?albumId         ^music:on        ?songId . ?songId          music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } } } ORDER BY(?songNumber)",
+      "query": "prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { ?alias   music:name       ?bandName ; music:genre      ?bandGenre ; music:album      ?albumId . ?albumId        music:released   ?albumReleaseDate ; music:song       ?songId . ?songId         music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } WHERE { VALUES ?id { {resource_id} } . BIND( IRI(concat(str(?id), '/', 'alias')) AS ?alias ) .  ?id   music:name       ?bandName ; music:genre      ?bandGenre . OPTIONAL { ?id ^music:by        ?albumId . ?albumId        music:released   ?albumReleaseDate . OPTIONAL {?albumId         ^music:on        ?songId . ?songId          music:title      ?songTitle ; music:number     ?songNumber ; music:length     ?songLength } } } ORDER BY(?songNumber)",
       "context": {
         "@base": "https://music.example.com/",
         "@vocab": "https://music.example.com/"
@@ -120,7 +120,7 @@
         },
         "dynamic": false
       },
-      "query": "prefix xsd: <http://www.w3.org/2001/XMLSchema#> prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { {resource_id}             music:name               ?albumTitle ; music:length             ?albumLength ; music:numberOfSongs      ?numberOfSongs } WHERE {SELECT ?albumReleaseDate ?albumTitle (sum(xsd:integer(?songLength)) as ?albumLength) (count(?albumReleaseDate) as ?numberOfSongs) WHERE {OPTIONAL { {resource_id}           ^music:on / music:length   ?songLength } {resource_id} music:released             ?albumReleaseDate ; music:title                ?albumTitle . } GROUP BY ?albumReleaseDate ?albumTitle }",
+      "query": "prefix xsd: <http://www.w3.org/2001/XMLSchema#> prefix music: <https://music.example.com/> prefix nxv: <https://bluebrain.github.io/nexus/vocabulary/> CONSTRUCT { ?alias             music:name               ?albumTitle ; music:length             ?albumLength ; music:numberOfSongs      ?numberOfSongs } WHERE {  SELECT ?albumReleaseDate ?albumTitle (sum(xsd:integer(?songLength)) as ?albumLength) (count(?albumReleaseDate) as ?numberOfSongs) WHERE { VALUES ?id { {resource_id} } . BIND( IRI(concat(str(?id), '/', 'alias')) AS ?alias ) . OPTIONAL {          ?id  ^music:on / music:length   ?songLength } ?id music:released             ?albumReleaseDate ; music:title                ?albumTitle . } GROUP BY ?albumReleaseDate ?albumTitle }",
       "context": {
         "@base": "https://music.example.com/",
         "@vocab": "https://music.example.com/"