diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
index 8f2e6f3e6..5eb873ef0 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
@@ -14,14 +14,16 @@ body.embed { padding-top: 0; }
 .navbar-form .btn-search { background-image: url('../icons/ic_search_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; }
 .action-bar { background-color: #dfdfdf; }
 .action-bar form { margin-bottom: 0; }
+.action-bar .span7 .row-fluid > * { margin-top: 10px; }
 .action-bar .add-constructor, .dropdown-menu .add-constructor { background-color: inherit; display: block; text-align: left; width: 100%; }
 .action-bar .add-constructor:hover { color: #ffffff; background-color: #007af5; }
-.action-bar .breadcrumb { background-color: inherit; margin-top: 10px; margin-bottom: 0; padding-left: 0; padding-top: 5px; }
+.action-bar .breadcrumb { background-color: inherit; margin-bottom: 0; padding-left: 0; padding-top: 5px; }
 .action-bar .breadcrumb .container-logo { background-image: url('../icons/folder.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; }
 .action-bar .breadcrumb .item-logo { background-image: url('../icons/file.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; }
 .action-bar .breadcrumb .btn-group { margin-top: -4px; }
-.action-bar #breadcrumb-nav > .label-info { margin-top: 10px; padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; }
-.action-bar #created-modified-date p { text-align: right; margin-top: 10px; padding-top: 5px; }
+.action-bar #breadcrumb-nav > .label-info { padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; }
+.action-bar #doc-controls { text-align: right; padding-top: 5px; }
+.action-bar #doc-controls .btn-edit { margin-top: -5px; margin-left: 10px; }
 .action-bar p.alert { margin-bottom: 0; }
 .nav-header.btn { color: inherit; }
 ul.dropdown-menu { max-height: 26em; overflow-x: hidden; overflow-y: auto; }
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
index 9b3543e65..3e826d4ee 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
@@ -115,7 +115,7 @@ exclude-result-prefixes="#all"
 
     <!-- TEMPLATES -->
 
-    <!-- render block -->
+    <!-- render row -->
     
     <!-- match resources that are not LDH system resources -->
     <xsl:template match="*[@typeof[not(. = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart'))]]" mode="ldh:RenderRow" priority="1">
@@ -181,7 +181,7 @@ exclude-result-prefixes="#all"
     
     <xsl:template match="div[following-sibling::div[@typeof = ('&ldh;XHTML', '&ldh;Object')]]//button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick" priority="1">
         <xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
-        <!-- for content types, button.btn-edit is placed in its own div.row-fluid, therefore the next row is the actual container -->
+        <!-- for block types, button.btn-edit is placed in its own div.row-fluid, therefore the next row is the actual container -->
         <xsl:param name="container" select="$block/descendant::div[@typeof][1]" as="element()"/> <!-- other resources can be nested within object -->
         
         <xsl:next-match>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
index f4c679f5d..ece15042a 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
@@ -361,6 +361,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="textarea" select="ancestor::form/descendant::textarea[@name = 'query']" as="element()"/>
         <xsl:variable name="yasqe" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.yasqe'), $textarea/ixsl:get(., 'id'))"/>
         <xsl:variable name="query-string" select="ixsl:call($yasqe, 'getValue', [])" as="xs:string?"/> <!-- get query string from YASQE -->
+        <xsl:variable name="method" select="'PATCH'" as="xs:string"/>
         <xsl:variable name="action" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
         <xsl:variable name="accept" select="'application/rdf+xml'" as="xs:string"/>
         <xsl:variable name="etag" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`'), 'etag')" as="xs:string"/>
@@ -377,7 +378,7 @@ exclude-result-prefixes="#all"
             </xsl:apply-templates>
         </xsl:variable>
         <xsl:variable name="triples" select="ldh:descriptions-to-triples($query)" as="element()*"/>
-        <xsl:variable name="update-string" select="ldh:triples-to-sparql-update($about, $triples)" as="xs:string"/>
+        <xsl:variable name="update-string" select="ldh:insertdelete-update(ldh:triples-to-bgp(ldh:uri-po-pattern($about)), ldh:triples-to-bgp($triples), ldh:triples-to-bgp(ldh:uri-po-pattern($about)))" as="xs:string"/>
         <xsl:variable name="resources" as="document-node()">
             <xsl:document>
                 <rdf:RDF>
@@ -386,19 +387,21 @@ exclude-result-prefixes="#all"
             </xsl:document>
         </xsl:variable>
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $action)" as="xs:anyURI"/>
-        
-        <xsl:variable name="request" as="item()*">
-            <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile --> 
-            <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string, 'headers': map{ 'If-Match': $etag, 'Accept': 'application/rdf+xml', 'Cache-Control': 'no-cache' } }">
-                <xsl:call-template name="ldh:ResourceUpdated">
-                    <xsl:with-param name="doc-uri" select="ac:absolute-path(ldh:base-uri(.))"/>
-                    <xsl:with-param name="block" select="$block"/>
-<!--                    <xsl:with-param name="container" select="$container"/>-->
-                    <xsl:with-param name="resources" select="$resources"/>
-                </xsl:call-template>
-            </ixsl:schedule-action>
-        </xsl:variable>
-        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+        <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile -->
+        <xsl:variable name="request" select="map{ 'method': $method, 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string, 'headers': map{ 'If-Match': $etag, 'Accept': 'application/rdf+xml', 'Cache-Control': 'no-cache' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'doc-uri': ac:absolute-path(ldh:base-uri(.)),
+            'block': $block,
+            'resources': $resources
+          }"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+            => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+            => ixsl:then(ldh:row-form-patch-response#1)
+        "/>
     </xsl:template>
     
     <!-- open query onclick -->
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
index 60a55c294..11b4a46e5 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
@@ -75,10 +75,11 @@ exclude-result-prefixes="#all"
         </xsl:for-each>
         
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, ac:document-uri($query-uri))" as="xs:anyURI"/>
-        <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
         <!-- $about in the query gets set to the @about of the *parent* block  -->
-        <xsl:variable name="callback-context" as="map(*)" select="
+        <xsl:variable name="context" as="map(*)" select="
           map{
+            'request': $request,
             'this': $this,
             'about': $parent-about,
             'block': $block,
@@ -87,10 +88,11 @@ exclude-result-prefixes="#all"
             'refresh-content': $refresh-content,
             'query-uri': $query-uri
           }"/>
-        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-        <xsl:sequence select="ixsl:http-request($request) =>
-            ixsl:then(ldh:handle-response($request, ?)) =>
-            ixsl:then(ldh:view-query-load($request, ?))"/>
+        <ixsl:promise select="ixsl:http-request($context('request')) =>
+            ixsl:then(ldh:rethread-response($context, ?)) =>
+            ixsl:then(ldh:handle-response#1) =>
+            ixsl:then(ldh:view-query-load#1)"
+            on-failure="ldh:promise-failure#1"/>
     </xsl:template>
     
     <!-- hide type control -->
@@ -244,16 +246,18 @@ exclude-result-prefixes="#all"
         <xsl:variable name="query-string" select="ixsl:call(ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromQuery', [ $select-json ]), 'toString', [])" as="xs:string"/>
         <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': $query-string })" as="xs:anyURI"/>
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $results-uri)" as="xs:anyURI"/>       
-        <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri,  'headers': map { 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
-        <xsl:variable name="callback-context" as="map(*)" select="
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri,  'headers': map { 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
           map {
+            'request': $request,
             'container': .,
             'count-var-name': $count-var-name
           }"/>
-        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-        <xsl:sequence select="ixsl:http-request($request) =>
-            ixsl:then(ldh:handle-response($request, ?)) =>
-            ixsl:then(ldh:result-count-results-load($request, ?))"/>
+        <ixsl:promise select="ixsl:http-request($context('request')) =>
+            ixsl:then(ldh:rethread-response($context, ?)) =>
+            ixsl:then(ldh:handle-response#1) =>
+            ixsl:then(ldh:result-count-results-load#1)"
+            on-failure="ldh:promise-failure#1"/>
     </xsl:template>
     
     <!-- order by -->
@@ -437,9 +441,10 @@ exclude-result-prefixes="#all"
                 </xsl:if>
             </xsl:map>
         </xsl:variable>
-        <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': $headers }" as="map(*)"/>
-        <xsl:variable name="callback-context" as="map(*)" select="
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': $headers }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
           map{
+            'request': $request,
             'block': $block,
             'container': $container,
             'container-id': generate-id($container),
@@ -450,10 +455,11 @@ exclude-result-prefixes="#all"
             'focus-var-name': $focus-var-name,
             'endpoint': $endpoint
           }"/>
-        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-        <xsl:sequence select="ixsl:http-request($request) =>
-            ixsl:then(ldh:handle-response($request, ?)) =>
-            ixsl:then(ldh:on-container-results-load($request, ?))"/>
+        <ixsl:promise select="ixsl:http-request($context('request')) =>
+            ixsl:then(ldh:rethread-response($context, ?)) =>        
+            ixsl:then(ldh:handle-response#1) =>
+            ixsl:then(ldh:container-results-response#1)"
+            on-failure="ldh:promise-failure#1"/>
     </xsl:template>
 
     <!-- $container here is the inner result container, not the content container! -->
@@ -468,6 +474,10 @@ exclude-result-prefixes="#all"
         <xsl:param name="select-xml" as="document-node()"/>
         <xsl:param name="base-uri" as="xs:anyURI"/>
         
+        <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
+            <ixsl:set-style name="width" select="'88%'" object="."/>
+        </xsl:for-each>
+
         <xsl:for-each select="$container">
             <xsl:result-document href="?." method="ixsl:replace-content">
                 <xsl:call-template name="ldh:ViewModeChoice">
@@ -643,18 +653,20 @@ exclude-result-prefixes="#all"
                     <xsl:variable name="predicate" select="json:string[@key = 'predicate']" as="xs:anyURI"/>
                     <xsl:variable name="object-var-name" select="json:string[@key = 'object']/substring-after(., '?')" as="xs:string"/>
                     <xsl:variable name="request-uri" select="ac:build-uri($ldt:base, map{ 'uri': string($predicate), 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                    <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-                    <xsl:variable name="callback-context" as="map(*)" select="
+                    <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                    <xsl:variable name="context" as="map(*)" select="
                       map{
+                        'request': $request,
                         'container': $sub-container,
                         'subject-var-name': $subject-var-name,
                         'predicate': $predicate,
                         'object-var-name': $object-var-name
                       }"/>
-                    <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                    <xsl:sequence select="ixsl:http-request($request) =>
-                        ixsl:then(ldh:handle-response($request, ?)) =>
-                        ixsl:then(ldh:facet-filter-results-load($request, ?))"/>
+                    <ixsl:promise select="ixsl:http-request($context('request')) =>
+                        ixsl:then(ldh:rethread-response($context, ?)) =>        
+                        ixsl:then(ldh:handle-response#1) =>
+                        ixsl:then(ldh:facet-filter-results-load#1)"
+                        on-failure="ldh:promise-failure#1"/>
                 </xsl:if>
             </xsl:for-each>
         </xsl:if>
@@ -866,17 +878,19 @@ exclude-result-prefixes="#all"
             <xsl:variable name="query-string" select="ixsl:call(ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromQuery', [ $query-json ]), 'toString', [])" as="xs:string"/>
             <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': $query-string })" as="xs:anyURI"/>
             <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $results-uri)" as="xs:anyURI"/>
-            <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
-            <xsl:variable name="callback-context" as="map(*)" select="
+            <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
+            <xsl:variable name="context" as="map(*)" select="
               map{
+                'request': $request,
                 'container': id($properties-container-id, ixsl:page()),
                 'var-name': $focus-var-name,
                 'results': $results
               }"/>
-            <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-            <xsl:sequence select="ixsl:http-request($request) =>
-                ixsl:then(ldh:handle-response($request, ?)) =>
-                ixsl:then(ldh:parallax-results-load($request, ?))"/>
+            <ixsl:promise select="ixsl:http-request($context('request')) =>
+                ixsl:then(ldh:rethread-response($context, ?)) =>
+                ixsl:then(ldh:handle-response#1) =>
+                ixsl:then(ldh:parallax-results-load#1)"
+                on-failure="ldh:promise-failure#1"/>
         </xsl:if>
     </xsl:template>
 
@@ -932,9 +946,10 @@ exclude-result-prefixes="#all"
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', true() ])[current-date() lt xs:date('2000-01-01')]"/>
         </xsl:for-each>
         
-        <xsl:variable name="http-request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-        <xsl:variable name="callback-context" as="map(*)" select="
+        <xsl:variable name="request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
           map{
+            'request': $request,
             'block': $block,
             'container': $results-container,
             'container-id': generate-id($container),
@@ -944,10 +959,11 @@ exclude-result-prefixes="#all"
             'select-xml': $select-xml,
             'base-uri': ldh:base-uri(.)
           }"/>
-        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-        <xsl:sequence select="ixsl:http-request($request) =>
-            ixsl:then(ldh:handle-response($request, ?)) =>
-            ixsl:then(ldh:container-object-metadata-results-load($request, ?))"/>
+        <ixsl:promise select="ixsl:http-request($context('request')) =>
+            ixsl:then(ldh:rethread-response($context, ?)) =>
+            ixsl:then(ldh:handle-response#1) =>
+            ixsl:then(ldh:container-object-metadata-results-load#1)"
+            on-failure="ldh:promise-failure#1"/>
     </xsl:template>
 
     <!-- pager prev links -->
@@ -1174,19 +1190,22 @@ exclude-result-prefixes="#all"
                     <xsl:variable name="query-string" select="ixsl:call(ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromQuery', [ $select-json ]), 'toString', [])" as="xs:string"/>
                     <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': $query-string })" as="xs:anyURI"/>
                     <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $results-uri)" as="xs:anyURI"/>
-                    <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
-                    <xsl:variable name="callback-context" as="map(*)" select="
+                    <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" as="map(*)"/>
+                    <xsl:variable name="context" as="map(*)" select="
                       map{
+                        'request': $request,
                         'container': $facet-container,
                         'predicate': $predicate,
                         'object-var-name': $object-var-name,
                         'count-var-name': $count-var-name,
                         'label-sample-var-name': $label-sample-var-name
                       }"/>
-                    <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                    <xsl:sequence select="ixsl:http-request($request) =>
-                        ixsl:then(ldh:handle-response($request, ?)) =>
-                        ixsl:then(ldh:facet-value-results-load($request, ?))"/>
+
+                    <ixsl:promise select="ixsl:http-request($context('request')) =>
+                        ixsl:then(ldh:rethread-response($context, ?)) =>
+                        ixsl:then(ldh:handle-response#1) =>
+                        ixsl:then(ldh:facet-value-results-load#1)"
+                        on-failure="ldh:promise-failure#1"/>
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
@@ -1296,18 +1315,20 @@ exclude-result-prefixes="#all"
 
     <!-- CALLBACKS -->
     
-    <xsl:function name="ldh:view-query-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="this" select="$request('this')" as="xs:anyURI"/>
-        <xsl:variable name="about" select="$request('about')" as="xs:anyURI"/>
-        <xsl:variable name="block" select="$request('block')" as="element()"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="mode" select="$request('mode')" as="xs:anyURI?"/>
-        <xsl:variable name="refresh-content" select="$request('refresh-content')" as="xs:boolean?"/>
-        <xsl:variable name="query-uri" select="$request('query-uri')" as="xs:anyURI"/>
+    <xsl:function name="ldh:view-query-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="this" select="$context('this')" as="xs:anyURI"/>
+        <xsl:variable name="about" select="$context('about')" as="xs:anyURI"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="mode" select="$context('mode')" as="xs:anyURI?"/>
+        <xsl:variable name="refresh-content" select="$context('refresh-content')" as="xs:boolean?"/>
+        <xsl:variable name="query-uri" select="$context('query-uri')" as="xs:anyURI"/>
         <xsl:variable name="block-uri" select="$block/@about" as="xs:anyURI"/>
 
+        <xsl:message>ldh:view-query-load</xsl:message>
+
         <xsl:for-each select="$response">
             <xsl:choose>
                 <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
@@ -1407,27 +1428,31 @@ exclude-result-prefixes="#all"
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
     <!-- when container RDF/XML results load, render them -->
-    <xsl:function name="ldh:on-container-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="block" select="$request('block')" as="element()"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="container-id" select="$request('container-id')" as="xs:string"/>
-        <xsl:variable name="active-mode" select="$request('active-mode')" as="xs:anyURI"/>
-        <xsl:variable name="select-xml" select="$request('select-xml')" as="document-node()"/>
-        <xsl:variable name="initial-var-name" select="$request('initial-var-name')" as="xs:string"/>
-        <xsl:variable name="focus-var-name" select="$request('focus-var-name')" as="xs:string"/>
-        <xsl:variable name="select-string" select="$request('select-string')" as="xs:string"/>
-        <xsl:variable name="endpoint" select="$request('endpoint')" as="xs:anyURI"/>
+    <xsl:function name="ldh:container-results-response" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="container-id" select="$context('container-id')" as="xs:string"/>
+        <xsl:variable name="active-mode" select="$context('active-mode')" as="xs:anyURI"/>
+        <xsl:variable name="select-xml" select="$context('select-xml')" as="document-node()"/>
+        <xsl:variable name="initial-var-name" select="$context('initial-var-name')" as="xs:string"/>
+        <xsl:variable name="focus-var-name" select="$context('focus-var-name')" as="xs:string"/>
+        <xsl:variable name="select-string" select="$context('select-string')" as="xs:string"/>
+        <xsl:variable name="endpoint" select="$context('endpoint')" as="xs:anyURI"/>
         <!-- if  the container is full-width row (.row-fluid), render results in the middle column (.main) -->
         <xsl:variable name="content-container" select="$container/div[contains-token(@class, 'main')]" as="element()"/>
         <xsl:variable name="container-results-id" select="$container-id || '-container-results'" as="xs:string"/>
         <xsl:variable name="order-by-container-id" select="$container-id || '-container-order'" as="xs:string"/>
         <xsl:variable name="result-count-container-id" select="$container-id || '-result-count'" as="xs:string"/>
         
+        <xsl:message>ldh:container-results-response</xsl:message>
+        
         <!-- update progress bar -->
         <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
             <ixsl:set-style name="width" select="'75%'" object="."/>
@@ -1527,41 +1552,46 @@ exclude-result-prefixes="#all"
                                     <xsl:variable name="id" select="generate-id()" as="xs:string"/>
                                     <xsl:variable name="predicate" select="json:string[@key = 'predicate']" as="xs:anyURI"/>
                                     <xsl:variable name="request-uri" select="ac:build-uri($ldt:base, map{ 'uri': string($predicate), 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                                    <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-                                    <xsl:variable name="callback-context" as="map(*)" select="
+                                    <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                                    <xsl:variable name="context" as="map(*)" select="
                                       map{
+                                        'request': $request,
                                         'container': id($order-by-container-id, ixsl:page()),
                                         'id': $id,
                                         'predicate': $predicate,
                                         'order-by-predicate': $order-by-predicate
                                       }"/>
-                                    <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                                    <xsl:sequence select="ixsl:http-request($request) =>
-                                        ixsl:then(ldh:handle-response($request, ?)) =>
-                                        ixsl:then(ldh:order-by-results-load($request, ?))"/>
+                                    <ixsl:promise select="ixsl:http-request($context('request')) =>
+                                        ixsl:then(ldh:rethread-response($context, ?)) =>
+                                        ixsl:then(ldh:handle-response#1) =>
+                                        ixsl:then(ldh:order-by-results-load#1)"
+                                        on-failure="ldh:promise-failure#1"/>
                                 </xsl:if>
                             </xsl:for-each>
                         </xsl:if>
 
                         <xsl:variable name="object-uris" select="distinct-values($sorted-results/rdf:RDF/rdf:Description/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
                         <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>                    
-                        <xsl:variable name="http-request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-                        <xsl:variable name="callback-context" as="map(*)" select="
-                          map{
-                            'block': $block,
-                            'container': $content-container//div[contains-token(@class, 'container-results')],
-                            'container-id': $container-id,
-                            'endpoint': $endpoint,
-                            'results': $sorted-results,
-                            'active-mode': $active-mode,
-                            'select-xml': $select-xml,
-                            'base-uri': ldh:base-uri(.)
-                          }"/>
-                        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                        <xsl:sequence select="ixsl:http-request($request) =>
-                            ixsl:then(ldh:handle-response($request, ?)) =>
-                            ixsl:then(ldh:container-object-metadata-results-load($request, ?))"/>
-                                            
+                        <xsl:variable name="request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                        <xsl:variable name="context" as="map(*)" select="map:merge((
+                            $context,
+                            map{
+                                'request': $request,
+                                'block': $block,
+                                'container': $content-container//div[contains-token(@class, 'container-results')],
+                                'container-id': $container-id,
+                                'endpoint': $endpoint,
+                                'results': $sorted-results,
+                                'active-mode': $active-mode,
+                                'select-xml': $select-xml,
+                                'base-uri': ldh:base-uri(.)
+                            }), map{ 'duplicates': 'use-last' })"/>
+                        <ixsl:promise select="ixsl:http-request($context('request')) =>
+                            ixsl:then(ldh:rethread-response($context, ?)) =>
+                            ixsl:then(ldh:handle-response#1) =>
+                            ixsl:then(ldh:container-object-metadata-results-load#1)"
+                            on-failure="ldh:promise-failure#1"/>
+                             
                         <!-- hide progress bar -->
                          <xsl:for-each select="$container//div[@class = 'progress-bar']">
                              <ixsl:set-style name="display" select="'none'" object="."/>
@@ -1609,17 +1639,21 @@ exclude-result-prefixes="#all"
         
         <!-- loading is done - restore the default mouse cursor -->
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
     <!-- transform SPARQL BGP triple into facet header and placeholder -->
-    <xsl:function name="ldh:facet-filter-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="subject-var-name" select="$request('subject-var-name')" as="xs:string"/>
-        <xsl:variable name="predicate" select="$request('predicate')" as="xs:anyURI"/>
-        <xsl:variable name="object-var-name" select="$request('object-var-name')" as="xs:string"/>
-
+    <xsl:function name="ldh:facet-filter-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="subject-var-name" select="$context('subject-var-name')" as="xs:string"/>
+        <xsl:variable name="predicate" select="$context('predicate')" as="xs:anyURI"/>
+        <xsl:variable name="object-var-name" select="$context('object-var-name')" as="xs:string"/>
+
+        <xsl:message>ldh:facet-filter-results-load</xsl:message>
+        
         <xsl:for-each select="$response">
             <xsl:if test="?status = 200 and ?media-type = 'application/rdf+xml' and ?body">
                 <xsl:variable name="body" select="?body" as="document-node()"/>
@@ -1635,14 +1669,18 @@ exclude-result-prefixes="#all"
             </xsl:if>
             <!-- ignore error response -->
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
-    <xsl:function name="ldh:parallax-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="var-name" select="$request('var-name')" as="xs:string"/>
-        <xsl:variable name="results" select="$request('results')" as="document-node()"/>
+    <xsl:function name="ldh:parallax-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="var-name" select="$context('var-name')" as="xs:string"/>
+        <xsl:variable name="results" select="$context('results')" as="document-node()"/>
+        
+        <xsl:message>ldh:parallax-results-load</xsl:message>
         
         <xsl:for-each select="$response">
             <xsl:choose>
@@ -1653,16 +1691,20 @@ exclude-result-prefixes="#all"
                         <xsl:for-each-group select="$results/rdf:RDF/*[@rdf:about = $var-name-resources]/*[@rdf:resource or @rdf:nodeID]" group-by="concat(namespace-uri(), local-name())">
                             <xsl:variable name="predicate" select="xs:anyURI(namespace-uri() || local-name())" as="xs:anyURI"/>
                             <xsl:variable name="request-uri" select="ac:build-uri($ldt:base, map{ 'uri': $predicate, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                            <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-                            <xsl:variable name="callback-context" as="map(*)" select="
+                            <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                            <xsl:variable name="context" select="map:merge((
+                              $context,
                               map{
+                                'request': $request,
                                 'container': $container,
                                 'predicate': $predicate
-                              }"/>
-                            <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                            <xsl:sequence select="ixsl:http-request($request) =>
-                                ixsl:then(ldh:handle-response($request, ?)) =>
-                                ixsl:then(ldh:parallax-property-load($request, ?))"/>
+                              }
+                            ), map{ 'duplicates': 'use-last' })"/> 
+                            <ixsl:promise select="ixsl:http-request($context('request')) =>
+                                ixsl:then(ldh:rethread-response($context, ?)) =>
+                                ixsl:then(ldh:handle-response#1) =>
+                                ixsl:then(ldh:parallax-property-load#1)"
+                                on-failure="ldh:promise-failure#1"/>
                         </xsl:for-each-group>
                     </xsl:for-each>
                 </xsl:when>
@@ -1682,15 +1724,19 @@ exclude-result-prefixes="#all"
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
+
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
-    <xsl:function name="ldh:parallax-property-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="class" select="$request('class')" as="xs:string?"/>
-        <xsl:variable name="id" select="$request('id')" as="xs:string?"/>
-        <xsl:variable name="predicate" select="$request('predicate')" as="xs:anyURI"/>
+    <xsl:function name="ldh:parallax-property-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="class" select="$context('class')" as="xs:string?"/>
+        <xsl:variable name="id" select="$context('id')" as="xs:string?"/>
+        <xsl:variable name="predicate" select="$context('predicate')" as="xs:anyURI"/>
+        
+        <xsl:message>ldh:parallax-property-load</xsl:message>
         
         <xsl:for-each select="$response">
             <xsl:variable name="results" select="if (?status = 200 and ?media-type = 'application/rdf+xml') then ?body else ()" as="document-node()?"/>
@@ -1737,17 +1783,21 @@ exclude-result-prefixes="#all"
                 </xsl:result-document>
             </xsl:for-each>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
-    <xsl:function name="ldh:facet-value-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="predicate" select="$request('predicate')" as="xs:anyURI"/>
-        <xsl:variable name="object-var-name" select="$request('object-var-name')" as="xs:string"/>
-        <xsl:variable name="count-var-name" select="$request('count-var-name')" as="xs:string"/>
-        <xsl:variable name="label-sample-var-name" select="$request('label-sample-var-name')" as="xs:string"/>
-
+    <xsl:function name="ldh:facet-value-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="predicate" select="$context('predicate')" as="xs:anyURI"/>
+        <xsl:variable name="object-var-name" select="$context('object-var-name')" as="xs:string"/>
+        <xsl:variable name="count-var-name" select="$context('count-var-name')" as="xs:string"/>
+        <xsl:variable name="label-sample-var-name" select="$context('label-sample-var-name')" as="xs:string"/>
+
+        <xsl:message>ldh:facet-value-results-load</xsl:message>
+        
         <xsl:for-each select="$response">
             <xsl:variable name="response" select="." as="map(*)"/>
             <xsl:choose>
@@ -1768,19 +1818,21 @@ exclude-result-prefixes="#all"
                                         <xsl:variable name="object-type" select="srx:binding[@name = $object-var-name]/srx:uri" as="xs:anyURI"/>
                                         <xsl:variable name="value-result" select="." as="element()"/>
                                         <xsl:variable name="request-uri" select="ac:build-uri($ldt:base, map{ 'uri': $object-type, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                                        <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
-                                        <xsl:variable name="callback-context" as="map(*)" select="
+                                        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                                        <xsl:variable name="context" as="map(*)" select="
                                           map{
+                                            'request': $request,
                                             'container': $container,
                                             'object-var-name': $object-var-name,
                                             'count-var-name': $count-var-name,
                                             'object-type': $object-type,
                                             'value-result': $value-result
                                           }"/>
-                                        <xsl:variable name="request" select="map:merge(($http-request, $callback-context))" as="map(*)"/>
-                                        <xsl:sequence select="ixsl:http-request($request) =>
-                                            ixsl:then(ldh:handle-response($request, ?)) =>
-                                            ixsl:then(ldh:facet-value-type-load($request, ?))"/>
+                                        <ixsl:promise select="ixsl:http-request($context('request')) =>
+                                            ixsl:then(ldh:rethread-response($context, ?)) =>
+                                            ixsl:then(ldh:handle-response#1) =>
+                                            ixsl:then(ldh:facet-value-type-load#1)"
+                                            on-failure="ldh:promise-failure#1"/>
                                     </xsl:for-each>
                                 </xsl:when>
                                 <xsl:otherwise>
@@ -1829,17 +1881,21 @@ exclude-result-prefixes="#all"
             <!-- done loading, restore normal cursor -->
             <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
     <xsl:function name="ldh:facet-value-type-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="object-var-name" select="$request('object-var-name')" as="xs:string"/>
-        <xsl:variable name="count-var-name" select="$request('count-var-name')" as="xs:string"/>
-        <xsl:variable name="object-type" select="$request('object-type')" as="xs:anyURI"/>
-        <xsl:variable name="value-result" select="$request('value-result')" as="element()"/>
-        
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="object-var-name" select="$context('object-var-name')" as="xs:string"/>
+        <xsl:variable name="count-var-name" select="$context('count-var-name')" as="xs:string"/>
+        <xsl:variable name="object-type" select="$context('object-type')" as="xs:anyURI"/>
+        <xsl:variable name="value-result" select="$context('value-result')" as="element()"/>
+
+        <xsl:message>ldh:facet-value-type-load</xsl:message>
+
         <xsl:for-each select="$response">
             <xsl:variable name="results" select="if (?status = 200 and ?media-type = 'application/rdf+xml') then ?body else ()" as="document-node()?"/>
             <xsl:variable name="existing-items" select="$container/ul/li" as="element()*"/>
@@ -1875,13 +1931,17 @@ exclude-result-prefixes="#all"
                 </xsl:result-document>
             </xsl:for-each>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
-    <xsl:function name="ldh:result-count-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="count-var-name" select="$request('count-var-name')" as="xs:string"/>
+    <xsl:function name="ldh:result-count-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="count-var-name" select="$context('count-var-name')" as="xs:string"/>
+
+        <xsl:message>ldh:result-count-results-load</xsl:message>
 
         <xsl:for-each select="$response">
             <xsl:choose>
@@ -1906,18 +1966,22 @@ exclude-result-prefixes="#all"
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
         
     <!-- order by -->
     
-    <xsl:function name="ldh:order-by-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="id" select="$request('id')" as="xs:string?"/>
-        <xsl:variable name="predicate" select="$request('predicate')" as="xs:anyURI"/>
-        <xsl:variable name="order-by-predicate" select="$request('order-by-predicate')" as="xs:anyURI?"/>
-
+    <xsl:function name="ldh:order-by-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="id" select="$context('id')" as="xs:string?"/>
+        <xsl:variable name="predicate" select="$context('predicate')" as="xs:anyURI"/>
+        <xsl:variable name="order-by-predicate" select="$context('order-by-predicate')" as="xs:anyURI?"/>
+
+        <xsl:message>ldh:order-by-results-load</xsl:message>
+        
         <xsl:for-each select="$response">
             <xsl:if test="?status = 200 and ?media-type = 'application/rdf+xml' and ?body">
                 <xsl:variable name="body" select="?body" as="document-node()"/>
@@ -1931,29 +1995,29 @@ exclude-result-prefixes="#all"
             </xsl:if>
             <!-- ignore error response -->
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
-    <xsl:function name="ldh:container-object-metadata-results-load" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="block" select="$request('block')" as="element()"/>
-        <xsl:variable name="container" select="$request('container')" as="element()"/>
-        <xsl:variable name="container-id" select="$request('container-id')" as="xs:string"/>
-        <xsl:variable name="endpoint" select="$request('endpoint')" as="xs:anyURI"/>
-        <xsl:variable name="results" select="$request('results')" as="document-node()"/>
-        <xsl:variable name="active-mode" select="$request('active-mode')" as="xs:anyURI"/>
-        <xsl:variable name="select-xml" select="$request('select-xml')" as="document-node()"/>
-        <xsl:variable name="base-uri" select="$request('base-uri')" as="xs:anyURI"/>
-
+    <xsl:function name="ldh:container-object-metadata-results-load" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="container-id" select="$context('container-id')" as="xs:string"/>
+        <xsl:variable name="endpoint" select="$context('endpoint')" as="xs:anyURI"/>
+        <xsl:variable name="results" select="$context('results')" as="document-node()"/>
+        <xsl:variable name="active-mode" select="$context('active-mode')" as="xs:anyURI"/>
+        <xsl:variable name="select-xml" select="$context('select-xml')" as="document-node()"/>
+        <xsl:variable name="base-uri" select="$context('base-uri')" as="xs:anyURI"/>
+
+        <xsl:message>ldh:container-object-metadata-results-load</xsl:message>
+        
         <xsl:for-each select="$response">
             <xsl:choose>
                 <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
                     <xsl:variable name="object-metadata" select="?body" as="document-node()"/>
 
-                    <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
-                        <ixsl:set-style name="width" select="'88%'" object="."/>
-                    </xsl:for-each>
-
                     <xsl:call-template name="ldh:RenderViewMode">
                         <xsl:with-param name="block" select="$block"/>
                         <xsl:with-param name="container" select="$container"/>
@@ -1975,6 +2039,8 @@ exclude-result-prefixes="#all"
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
     </xsl:function>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl
index 112343d9a..aef6a3d5f 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl
@@ -11,6 +11,7 @@
     <!ENTITY http       "http://www.w3.org/2011/http#">
     <!ENTITY ldt        "https://www.w3.org/ns/ldt#">
     <!ENTITY dh         "https://www.w3.org/ns/ldt/document-hierarchy#">
+    <!ENTITY acl        "http://www.w3.org/ns/auth/acl#">
     <!ENTITY cert       "http://www.w3.org/ns/auth/cert#">
     <!ENTITY sd         "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY sh         "http://www.w3.org/ns/shacl#">
@@ -38,8 +39,10 @@ xmlns:rdfs="&rdfs;"
 xmlns:dct="&dct;"
 xmlns:typeahead="&typeahead;"
 xmlns:ldt="&ldt;"
+xmlns:acl="&acl;"
 xmlns:sd="&sd;"
 xmlns:sh="&sh;"
+xmlns:sioc="&sioc;"
 xmlns:spin="&spin;"
 xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
 extension-element-prefixes="ixsl"
@@ -97,12 +100,15 @@ WHERE
 
     <!-- TEMPLATES -->
     
-    <!-- hide constraint violations and HTTP responses in the row form - they are displayed as errors on the edited resources -->
+    <!-- suppress constraint violations and HTTP responses in the row form - they are displayed as errors on the edited resources -->
     <xsl:template match="*[rdf:type/@rdf:resource = ('&spin;ConstraintViolation', '&sh;ValidationResult', '&sh;ValidationReport', '&http;Response')]" mode="bs2:RowForm" priority="3"/>
 
-    <!-- hide constraint violations and HTTP responses in the form - they are displayed as errors on the edited resources -->
+    <!-- suppress constraint violations and HTTP responses in the form - they are displayed as errors on the edited resources -->
     <xsl:template match="*[rdf:type/@rdf:resource = ('&spin;ConstraintViolation', '&sh;ValidationResult', '&sh;ValidationReport', '&http;Response')]" mode="bs2:Form" priority="3"/>
 
+    <!-- suppress the system properties of document resources (they are set automatically by LinkedDataHub) -->
+    <xsl:template match="*[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/dct:created | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/dct:modified | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/sioc:has_container | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/sioc:has_parent | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/dct:creator | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/acl:owner | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/*[namespace-uri() = '&rdf;'][starts-with(local-name(), '_')]" mode="bs2:FormControl" priority="1"/>
+    
     <!-- canonicalize XML in rdf:XMLLiterals -->
     <xsl:template match="json:string[@key = 'object'][ends-with(., '^^&rdf;XMLLiteral')]" mode="ldh:CanonicalizeXML" priority="1">
         <xsl:copy>
@@ -189,7 +195,7 @@ WHERE
         <ixsl:set-attribute name="type" select="'text'"/>
         
         <xsl:variable name="timezone" select="ixsl:get(following-sibling::input[contains-token(@class, 'input-timezone')], 'value')" as="xs:string"/>
-        <!--TO-DO: handle invalid timezone values -->
+        <!-- concatenate datetime-local value together with timezone TO-DO: handle invalid timezone values -->
         <xsl:variable name="timezoned-value" select="xs:dateTime(ixsl:get(., 'value') || $timezone)" as="xs:dateTime"/>
         <ixsl:set-property name="value" select="$timezoned-value" object="."/>
     </xsl:template>
@@ -264,9 +270,6 @@ WHERE
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
         
-        <xsl:if test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')">
-            <xsl:variable name="etag" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`'), 'etag')" as="xs:string"/>
-        </xsl:if>
         <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $about || '`'))">
             <ixsl:set-property name="{'`' || $about || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
         </xsl:if>
@@ -275,134 +278,280 @@ WHERE
 
         <!-- if the URI is external, dereference it through the proxy -->
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, ac:absolute-path(ldh:base-uri(.)), $graph, ())" as="xs:anyURI"/>
-        
-        <xsl:variable name="request" as="item()*">
-            <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile --> 
-            <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
-                <xsl:call-template name="ldh:LoadEditedDocument">
-                    <xsl:with-param name="block" select="$block"/>
-                    <xsl:with-param name="about" select="$about"/>
-                </xsl:call-template>
-            </ixsl:schedule-action>
-        </xsl:variable>
-        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'block': $block,
+            'about': $about
+          }"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+            => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+            => ixsl:then(ldh:load-edited-resource#1)                      (: Step 4: extract resource, build next request :)
+            => ixsl:then(ldh:http-request-threaded#1)                     (: Step 5: send next request and rethread :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 6: handle retry if needed :)
+            => ixsl:then(ldh:load-type-metadata#1)                        (: Step 7: final step using full context :)
+            => ixsl:then(ldh:render-row-form#1)
+        "/>
     </xsl:template>
 
-    <xsl:template name="ldh:LoadEditedDocument">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="block" as="element()"/>
-        <xsl:param name="about" as="xs:anyURI"/>
+    <!-- open a form form document editing -->
+    
+    <xsl:template match="div[contains-token(@class, 'navbar')]//div[@id = 'doc-controls']//button[contains-token(@class, 'btn-edit')]" mode="ixsl:onclick">
+        <xsl:param name="about" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/> <!-- editing the current document resources -->
+        <xsl:param name="graph" as="xs:anyURI?"/>
+        <xsl:param name="method" select="'patch'" as="xs:string"/>
+        <xsl:param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
+        <xsl:param name="button-class" select="'btn btn-primary wymupdate'" as="xs:string?"/>
+        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
 
-        <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
-                <xsl:variable name="etag" select="?headers?etag" as="xs:string?"/>
-                
-                <xsl:for-each select="?body">
-                    <ixsl:set-property name="{'`' || ac:absolute-path(ldh:base-uri(.)) || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
-                    <!-- store document under window.LinkedDataHub.contents[$base-uri].results -->
-                    <ixsl:set-property name="results" select="." object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')"/>
-                    <!-- store ETag header value under window.LinkedDataHub.contents[$base-uri].etag -->
-                    <ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')"/>
-
-                    <xsl:variable name="resource" select="key('resources', $about)" as="element()"/> <!-- TO-DO: handle error -->
-                    <xsl:variable name="types" select="distinct-values($resource/rdf:type/@rdf:resource)" as="xs:anyURI*"/>
-                    <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+        <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
 
-                    <xsl:variable name="request" as="item()*">
-                        <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile --> 
-                        <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
-                            <xsl:call-template name="ldh:LoadTypeMetadata">
-                                <xsl:with-param name="block" select="$block"/>
-                                <xsl:with-param name="resource" select="$resource"/>
-                                <xsl:with-param name="types" select="$types"/>
-                            </xsl:call-template>
-                        </ixsl:schedule-action>
-                    </xsl:variable>
-                    <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
-                </xsl:for-each>
-            </xsl:when>
-            <!-- error response -->
-            <xsl:otherwise>
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>
-            </xsl:otherwise>
-        </xsl:choose>
+<!--        <xsl:if test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')">
+            <xsl:variable name="etag" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`'), 'etag')" as="xs:string"/>
+        </xsl:if>-->
+        <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $about || '`'))">
+            <ixsl:set-property name="{'`' || $about || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
+        </xsl:if>
+
+        <xsl:variable name="block-id" select="'block-' || generate-id()" as="xs:string"/>
+        <xsl:for-each select="$content-body">
+            <xsl:result-document href="?." method="ixsl:append-content">
+                <div class="modal modal-constructor fade in" about="{$about}">
+                    <div class="modal-header">
+                        <button type="button" class="close">&#215;</button>
+                    </div>
+                    <div class="modal-body" id="{$block-id}">
+                        <!-- to be injected -->
+                    </div>
+                </div>
+            </xsl:result-document>
+        </xsl:for-each>
+        <xsl:variable name="block" select="id($block-id, ixsl:page())" as="element()"/>
+        
+        <!-- if the URI is external, dereference it through the proxy -->
+        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, ac:absolute-path(ldh:base-uri(.)), $graph, ())" as="xs:anyURI"/>
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'block': $block,
+            'about': $about,
+            'method': $method
+          }"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+            => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+            => ixsl:then(ldh:load-edited-resource#1)                      (: Step 4: extract resource, build next request :)
+            => ixsl:then(ldh:http-request-threaded#1)                     (: Step 5: send next request and rethread :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 6: handle retry if needed :)
+            => ixsl:then(ldh:load-type-metadata#1)                        (: Step 7: final step using full context :)
+            => ixsl:then(ldh:wrap-into-document#1)
+            => ixsl:then(ldh:render-form#1)
+        "/>
     </xsl:template>
     
-    <xsl:template name="ldh:LoadTypeMetadata">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="block" as="element()"/>
-        <xsl:param name="resource" as="element()"/>
-        <xsl:param name="types" as="xs:anyURI*"/>
+    <xsl:function name="ldh:load-edited-resource" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="about" select="$context('about')" as="xs:anyURI"/>
 
-        <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
-                <xsl:variable name="type-metadata" select="?body" as="document-node()?"/>
+        <xsl:for-each select="$response">
+            <xsl:choose>
+                <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
+                    <xsl:variable name="etag" select="?headers?etag" as="xs:string?"/>
+
+                    <xsl:for-each select="?body">
+                        <ixsl:set-property name="{'`' || ac:absolute-path(ldh:base-uri(.)) || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
+                        <!-- store document under window.LinkedDataHub.contents[$base-uri].results -->
+                        <ixsl:set-property name="results" select="." object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')"/>
+                        <!-- store ETag header value under window.LinkedDataHub.contents[$base-uri].etag -->
+                        <ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`')"/>
+
+                        <xsl:variable name="resource" select="key('resources', $about)" as="element()"/> <!-- TO-DO: handle error -->
+                        <xsl:variable name="types" select="distinct-values($resource/rdf:type/@rdf:resource)" as="xs:anyURI*"/>
+                        <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+                        <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+                        <xsl:variable name="http-request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+                        <xsl:sequence select="map:merge(($context, map{
+                          'request': $http-request,
+                          'block': $block,
+                          'resource': $resource,
+                          'types': $types,
+                          'response': () (: clear old response :)
+                        }), map{ 'duplicates': 'use-last' })"/>
+                    </xsl:for-each>
+                </xsl:when>
+                <!-- error response -->
+                <xsl:otherwise>
+<!--                    <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+                    <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>-->
+                    <xsl:sequence select="error(QName('&ldh;', 'ldh:ldh:load-edited-resource-error'), 'Could not load edited resource', map{ 'code': 999 })"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:function>
+    
+    <xsl:function name="ldh:load-type-metadata" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="resource" select="$context('resource')" as="element()"/>
+        <xsl:variable name="types" select="$context('types')" as="xs:anyURI*"/>
 
-                <!-- TO-DO: refactor to use asynchronous HTTP requests -->
-                <xsl:variable name="property-uris" select="distinct-values($resource/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
-                <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="property-metadata" select="document($request-uri)" as="document-node()"/>
+        <xsl:for-each select="$response">
+            <xsl:choose>
+                <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
+                    <xsl:variable name="type-metadata" select="?body" as="document-node()?"/>
 
-                <xsl:variable name="query-string" select="$constructor-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="constructors" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+                    <!-- TO-DO: refactor to use asynchronous HTTP requests -->
+                    <xsl:variable name="property-uris" select="distinct-values($resource/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
+                    <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+                    <xsl:variable name="property-metadata" select="document($request-uri)" as="document-node()"/>
 
-                <xsl:variable name="query-string" select="$constraint-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="constraints" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+                    <xsl:variable name="query-string" select="$constructor-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+                    <xsl:variable name="constructors" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+                    <xsl:variable name="query-string" select="$constraint-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+                    <xsl:variable name="constraints" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+                    <xsl:variable name="query-string" select="$shape-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+                    <xsl:variable name="shapes" select="document($request-uri)" as="document-node()"/>
+
+                    <xsl:variable name="object-uris" select="distinct-values($resource/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
+                    <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+                    <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+                    <xsl:variable name="object-metadata" select="if (doc-available($request-uri)) then document($request-uri) else ()" as="document-node()?"/>
+
+                    <xsl:sequence select="map:merge(($context, map{
+                        'response': (),
+                        'type-metadata': $type-metadata,
+                        'property-metadata': $property-metadata,
+                        'constructors': $constructors,
+                        'constraints': $constraints,
+                        'shapes': $shapes,
+                        'object-metadata': $object-metadata
+                    }), map{ 'duplicates': 'use-last' })"/>
+                </xsl:when>
+                <!-- error response -->
+                <xsl:otherwise>
+                    <xsl:sequence select="error(QName('&ldh;', 'ldh:type-metadata-response-error'), 'Could not load type metadata', map{ 'code': 999 })"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:function>
+    
+    <xsl:function name="ldh:wrap-into-document" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="resource" select="$context('resource')" as="element()"/>
+
+        <xsl:variable name="document" as="document-node()">
+            <xsl:document>
+                <rdf:RDF>
+                    <xsl:sequence select="$resource"/>
+                </rdf:RDF>
+            </xsl:document>
+        </xsl:variable>
+        <xsl:sequence select="map:merge(($context, map{
+            'document': $document
+        }), map{ 'duplicates': 'use-last' })"/>
+    </xsl:function>
+    
+    <xsl:function name="ldh:render-row-form" as="item()*" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="resource" select="$context('resource')" as="element()"/>
+        <xsl:variable name="type-metadata" select="$context('type-metadata')" as="document-node()?"/>
+        <xsl:variable name="property-metadata" select="$context('property-metadata')" as="document-node()"/>
+        <xsl:variable name="constructors" select="$context('constructors')" as="document-node()?"/>
+        <xsl:variable name="constraints" select="$context('constraints')" as="document-node()?"/>
+        <xsl:variable name="shapes" select="$context('shapes')" as="document-node()"/>
+        <xsl:variable name="object-metadata" select="$context('object-metadata')" as="document-node()?"/>
                 
-                <xsl:variable name="query-string" select="$shape-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="shapes" select="document($request-uri)" as="document-node()"/>
+        <xsl:for-each select="$block">
+            <xsl:variable name="row" as="node()*">
+                <xsl:apply-templates select="$resource" mode="bs2:RowForm">
+                    <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
+                    <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
+                    <xsl:with-param name="constructors" select="$constructors" tunnel="yes"/>
+                    <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
+                    <xsl:with-param name="shapes" select="$shapes" tunnel="yes"/>
+                    <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
+                </xsl:apply-templates>
+            </xsl:variable>
 
-                <xsl:variable name="object-uris" select="distinct-values($resource/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
-                <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="object-metadata" select="if (doc-available($request-uri)) then document($request-uri) else ()" as="document-node()?"/>
+            <!-- replace block element attributes TO-DO: shouldn't be necessary in SaxonJS 3 using method="ixsl:replace-element": https://saxonica.plan.io/issues/6303#note-2 -->
+            <xsl:for-each select="@*">
+                <ixsl:remove-attribute object="$block" name="{name()}"/>
+            </xsl:for-each>
+            <xsl:for-each select="$row/@*">
+                <ixsl:set-attribute object="$block" name="{name()}" select="."/>
+            </xsl:for-each>
 
-                <xsl:for-each select="$block">
-                    <xsl:variable name="row" as="node()*">
-                        <xsl:apply-templates select="$resource" mode="bs2:RowForm">
-                            <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
-                            <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
-                            <xsl:with-param name="constructors" select="$constructors" tunnel="yes"/>
-                            <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
-                            <xsl:with-param name="shapes" select="$shapes" tunnel="yes"/>
-                            <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
-                        </xsl:apply-templates>
-                    </xsl:variable>
+            <xsl:result-document href="?." method="ixsl:replace-content">
+                <xsl:copy-of select="$row/*"/> <!-- inject the content of div.row-fluid -->
+            </xsl:result-document>
+        </xsl:for-each>
 
-                    <!-- replace block element attributes TO-DO: shouldn't be necessary in SaxonJS 3 using method="ixsl:replace-element": https://saxonica.plan.io/issues/6303#note-2 -->
-                    <xsl:for-each select="@*">
-                        <ixsl:remove-attribute object="$block" name="{name()}"/>
-                    </xsl:for-each>
-                    <xsl:for-each select="$row/@*">
-                        <ixsl:set-attribute object="$block" name="{name()}" select="."/>
-                    </xsl:for-each>
-                    
-                    <xsl:result-document href="?." method="ixsl:replace-content">
-                        <xsl:copy-of select="$row/*"/> <!-- inject the content of div.row-fluid -->
-                    </xsl:result-document>
-                </xsl:for-each>
+        <!-- initialize event listeners -->
+        <xsl:apply-templates select="$block" mode="ldh:RenderRowForm"/>
 
-                <!-- initialize event listeners -->
-                <xsl:apply-templates select="$block" mode="ldh:RenderRowForm"/>
+        <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+    </xsl:function>
+    
+    <xsl:function name="ldh:render-form" as="item()*" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="document" select="$context('document')" as="document-node()"/>
+        <xsl:variable name="type-metadata" select="$context('type-metadata')" as="document-node()?"/>
+        <xsl:variable name="property-metadata" select="$context('property-metadata')" as="document-node()"/>
+        <xsl:variable name="constructors" select="$context('constructors')" as="document-node()?"/>
+        <xsl:variable name="constraints" select="$context('constraints')" as="document-node()?"/>
+        <xsl:variable name="shapes" select="$context('shapes')" as="document-node()"/>
+        <xsl:variable name="object-metadata" select="$context('object-metadata')" as="document-node()?"/>
+        <xsl:variable name="method" select="$context('method')" as="xs:string"/>
+        <xsl:variable name="action" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri($document)), map{}, ac:absolute-path(ldh:base-uri($document)))" as="xs:anyURI"/>
+        
+        <xsl:for-each select="$block">
+            <xsl:variable name="form" as="node()*">
+                <xsl:apply-templates select="$document" mode="bs2:Form"> <!-- document level template -->
+                    <xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
+                    <xsl:with-param name="method" select="$method"/>
+                    <xsl:with-param name="action" select="$action"/>
+                    <xsl:with-param name="form-actions-class" select="'form-actions modal-footer'"/>
+                    <xsl:with-param name="classes" select="()"/>
+                    <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
+                    <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
+<!--                    <xsl:with-param name="constructor" select="$constructed-doc" tunnel="yes"/>-->
+                    <xsl:with-param name="constructors" select="()" tunnel="yes"/> <!-- can be empty because modal form is only used to create Container/Item instances -->
+                    <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
+                    <xsl:with-param name="shapes" select="()" tunnel="yes"/> <!-- there will be no shapes as modal form is only used to create Container/Item instances -->
+                    <xsl:with-param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" tunnel="yes"/> <!-- ac:absolute-path(ldh:base-uri(.)) is empty on constructed documents -->
+                    <!-- <xsl:sort select="ac:label(.)"/> -->
+                </xsl:apply-templates>
+            </xsl:variable>
 
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-            </xsl:when>
-            <!-- error response -->
-            <xsl:otherwise>
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
+            <xsl:result-document href="?." method="ixsl:replace-content">
+                <xsl:copy-of select="$form"/>
+            </xsl:result-document>
+        </xsl:for-each>
+
+        <!-- initialize event listeners -->
+        <xsl:apply-templates select="$block" mode="ldh:RenderRowForm"/>
+
+        <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+    </xsl:function>
     
     <!-- TO-DO: unify -->
-    <xsl:template match="div[@typeof]//button[contains-token(@class, 'btn-cancel')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
+    <xsl:template match="div[ancestor::div[contains-token(@class, 'block')]]//button[contains-token(@class, 'btn-cancel')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:variable name="container" select="ancestor::div[contains-token(@class, 'row-fluid')][1]" as="element()"/>
@@ -426,10 +575,12 @@ WHERE
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
     </xsl:template>
     
-    <!-- submit instance creation form using POST -->
+    <!-- submit instance creation row-form using POST or modal form using PUT -->
     
-    <xsl:template match="form[contains-token(@class, 'form-horizontal')]" mode="ixsl:onsubmit">
-        <xsl:param name="method" select="@method" as="xs:string"/>
+    <xsl:template match="form[ancestor::div[@typeof]][contains-token(@class, 'form-horizontal')]" mode="ixsl:onsubmit">
+        <xsl:param name="block" select="ancestor::div[@typeof][1]" as="element()"/> <!-- block has no @about at this stage (before saving it) -->
+        <xsl:param name="form" select="." as="element()"/>
+        <xsl:param name="method" select="upper-case(@method)" as="xs:string"/>
         <xsl:param name="elements" select=".//input | .//textarea | .//select" as="element()*"/>
         <xsl:param name="triples" select="ldh:parse-rdf-post($elements)" as="element()*"/>
         <xsl:param name="resources" as="document-node()">
@@ -442,9 +593,6 @@ WHERE
         <xsl:param name="request-body" select="$resources" as="document-node()"/>
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="modal" select="exists(ancestor::div[contains-token(@class, 'modal-constructor')])" as="xs:boolean"/>
-<!--        <xsl:variable name="container" select="ancestor::div[@typeof][1]" as="element()"/>-->
-        <xsl:variable name="block" select="ancestor::div[@typeof][1]" as="element()"/> <!-- block has no @about at this stage (before saving it) -->
-        <xsl:variable name="form" select="." as="element()"/>
         <xsl:variable name="id" select="ixsl:get($form, 'id')" as="xs:string"/>
         <xsl:variable name="action" select="ixsl:get($form, 'action')" as="xs:anyURI"/>
         <xsl:variable name="enctype" select="ixsl:get($form, 'enctype')" as="xs:string"/>
@@ -475,30 +623,36 @@ WHERE
                 <xsl:sequence select="js:fetchDispatchXML($request-uri, $method, $headers, $form-data, ., $doc-uri, $resources, $block, 'MultipartResourceUpdated')[current-date() lt xs:date('2000-01-01')]"/>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:variable name="request" as="item()*">
-                    <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile --> 
-                    <ixsl:schedule-action http-request="map{ 'method': $method, 'href': $request-uri, 'media-type': 'application/rdf+xml', 'body': $request-body, 'headers': map{ 'If-Match': $etag, 'Accept': $accept } }">
-                        <xsl:call-template name="ldh:ResourceUpdated">
-                            <xsl:with-param name="doc-uri" select="$doc-uri"/>
-                            <xsl:with-param name="block" select="$block"/>
-                            <xsl:with-param name="form" select="$form"/>
-                            <xsl:with-param name="modal" select="$modal"/>
-                            <xsl:with-param name="resources" select="$resources"/>
-                        </xsl:call-template>
-                    </ixsl:schedule-action>
-                </xsl:variable>
-                <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+                <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile -->
+                <xsl:variable name="request" select="map{ 'method': $method, 'href': $request-uri, 'media-type': 'application/rdf+xml', 'body': $request-body, 'headers': map{ 'If-Match': $etag, 'Accept': $accept } }" as="map(*)"/>
+                <xsl:variable name="context" as="map(*)" select="
+                  map{
+                    'request': $request,
+                    'doc-uri': $doc-uri,
+                    'block': $block,
+                    'form': $form,
+                    'modal': $modal,
+                    'resources': $resources
+                  }"/>
+            
+                <ixsl:promise select="
+                  ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+                    => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+                    => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+                    => ixsl:then(ldh:form-horizontal-response#1)
+                "/>   
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+
+    <!-- submit document update modal form using PATCH TO-DO: unify!!! -->
     
-    <!-- submit instance update form using PATCH -->
-    
-    <xsl:template match="div[@typeof]//form[contains-token(@class, 'form-horizontal')][upper-case(@method) = 'PATCH']" mode="ixsl:onsubmit" priority="1">
+    <xsl:template match="div[contains-token(@class, 'modal-constructor')]//form[contains-token(@class, 'form-horizontal')][upper-case(@method) = 'PATCH']" mode="ixsl:onsubmit" priority="2">
+        <xsl:param name="block" select="ancestor::div[contains-token(@class, 'modal-constructor')]" as="element()"/>
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
-<!--        <xsl:variable name="container" select="ancestor::div[@typeof][1]" as="element()?"/>-->
         <xsl:variable name="form" select="." as="element()"/>
+        <xsl:variable name="method" select="upper-case(@method)" as="xs:string"/>
+        <xsl:variable name="modal" select="false()" as="xs:boolean"/>
         <xsl:variable name="id" select="ixsl:get($form, 'id')" as="xs:string"/>
         <xsl:variable name="action" select="ixsl:get($form, 'action')" as="xs:anyURI"/>
         <xsl:variable name="enctype" select="ixsl:get($form, 'enctype')" as="xs:string"/>
@@ -516,8 +670,74 @@ WHERE
         <xsl:variable name="triples" as="element()*">
             <xsl:apply-templates select="$triples" mode="ldh:CanonicalizeXML"/>
         </xsl:variable>
-
-        <xsl:variable name="update-string" select="ldh:triples-to-sparql-update($about, $triples)" as="xs:string"/>
+        <!-- need a customer DELETE/WHERE pattern because the default $about ?p ?o would delete system properties such as dct:created or sioc:has_parent -->
+        <xsl:variable name="where-pattern" as="element()*">
+            <json:map>
+                <json:string key="type">bgp</json:string>
+                <json:array key="triples">
+                    <json:map>
+                        <json:string key="subject"><xsl:value-of select="$about"/></json:string>
+                        <json:string key="predicate">?p</json:string>
+                        <json:string key="object">?o</json:string>
+                    </json:map>
+                </json:array>
+            </json:map>
+            <json:map>
+                <json:string key="type">filter</json:string>
+                <json:map key="expression">
+                    <json:string key="type">operation</json:string>
+                    <json:string key="operator">notin</json:string>
+                    <json:array key="args">
+                        <json:string>?p</json:string>
+                        <json:array>
+                            <json:string>&dct;reated</json:string>
+                            <json:string>&dct;modified</json:string>
+                            <json:string>&sioc;has_parent</json:string>
+                            <json:string>&sioc;has_container</json:string>
+                            <json:string>&dct;creator</json:string>
+                            <json:string>&acl;owner</json:string>
+                        </json:array>
+                    </json:array>
+                </json:map>
+            </json:map>
+            <json:map>
+                <json:string key="type">filter</json:string>
+                <json:map key="expression">
+                    <json:string key="type">operation</json:string>
+                    <json:string key="operator">!</json:string>
+                    <json:array key="args">
+                        <json:map>
+                            <json:string key="type">operation</json:string>
+                            <json:string key="operator">strstarts</json:string>
+                            <json:array key="args">
+                                <json:map>
+                                    <json:string key="type">operation</json:string>
+                                    <json:string key="operator">str</json:string>
+                                    <json:array key="args">
+                                        <json:string>?p</json:string>
+                                    </json:array>
+                                </json:map>
+                                <json:map>
+                                    <json:string key="type">operation</json:string>
+                                    <json:string key="operator">concat</json:string>
+                                    <json:array key="args">
+                                        <json:map>
+                                            <json:string key="type">operation</json:string>
+                                            <json:string key="operator">str</json:string>
+                                            <json:array key="args">
+                                                <json:string>http://www.w3.org/1999/02/22-rdf-syntax-ns#</json:string>
+                                            </json:array>
+                                        </json:map>
+                                        <json:string>"_"</json:string>
+                                    </json:array>
+                                </json:map>
+                            </json:array>
+                        </json:map>
+                    </json:array>
+                </json:map>
+            </json:map>
+        </xsl:variable>
+        <xsl:variable name="update-string" select="ldh:insertdelete-update(ldh:triples-to-bgp(ldh:uri-po-pattern($about)), ldh:triples-to-bgp($triples), $where-pattern)" as="xs:string"/>
         <xsl:variable name="resources" as="document-node()">
             <xsl:document>
                 <rdf:RDF>
@@ -526,19 +746,77 @@ WHERE
             </xsl:document>
         </xsl:variable>
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $action)" as="xs:anyURI"/>
+        <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile -->
+        <xsl:variable name="request" select="map{ 'method': $method, 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string, 'headers': map{ 'If-Match': $etag, 'Accept': 'application/rdf+xml', 'Cache-Control': 'no-cache' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'doc-uri': ac:absolute-path(ldh:base-uri(.)),
+            'block': $block,
+            'form': $form,
+            'modal': $modal,
+            'resources': $resources
+          }"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+            => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+            => ixsl:then(ldh:modal-form-patch-response#1)
+        " on-failure="ldh:promise-failure#1"/>
+    </xsl:template>
         
-        <xsl:variable name="request" as="item()*">
-            <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile --> 
-            <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string, 'headers': map{ 'If-Match': $etag, 'Accept': 'application/rdf+xml', 'Cache-Control': 'no-cache' } }">
-                <xsl:call-template name="ldh:ResourceUpdated">
-                    <xsl:with-param name="doc-uri" select="ac:absolute-path(ldh:base-uri(.))"/>
-                    <xsl:with-param name="block" select="$block"/>
-                    <xsl:with-param name="form" select="$form"/>
-                    <xsl:with-param name="resources" select="$resources"/>
-                </xsl:call-template>
-            </ixsl:schedule-action>
+    <!-- submit instance update block-form using PATCH -->
+    
+    <xsl:template match="div[contains-token(@class, 'block')]//form[contains-token(@class, 'form-horizontal')][upper-case(@method) = 'PATCH']" mode="ixsl:onsubmit" priority="1">
+        <xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
+        <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+        <xsl:variable name="form" select="." as="element()"/>
+        <xsl:variable name="method" select="upper-case(@method)" as="xs:string"/>
+        <xsl:variable name="modal" select="false()" as="xs:boolean"/>
+        <xsl:variable name="id" select="ixsl:get($form, 'id')" as="xs:string"/>
+        <xsl:variable name="action" select="ixsl:get($form, 'action')" as="xs:anyURI"/>
+        <xsl:variable name="enctype" select="ixsl:get($form, 'enctype')" as="xs:string"/>
+        <xsl:variable name="about" select="$block/@about" as="xs:anyURI"/>
+        <xsl:variable name="etag" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:base-uri(.)) || '`'), 'etag')" as="xs:string"/>
+
+        <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
+        
+        <!-- pre-process form before submitting it -->
+        <xsl:apply-templates select="." mode="ldh:FormPreSubmit"/>
+
+        <xsl:variable name="elements" select=".//input | .//textarea | .//select" as="element()*"/>
+        <xsl:variable name="triples" select="ldh:parse-rdf-post($elements)" as="element()*"/>        
+        <!-- canonicalize XML in rdf:XMLLiterals -->
+        <xsl:variable name="triples" as="element()*">
+            <xsl:apply-templates select="$triples" mode="ldh:CanonicalizeXML"/>
+        </xsl:variable>
+
+        <xsl:variable name="update-string" select="ldh:insertdelete-update(ldh:triples-to-bgp(ldh:uri-po-pattern($about)), ldh:triples-to-bgp($triples), ldh:triples-to-bgp(ldh:uri-po-pattern($about)))" as="xs:string"/>
+        <xsl:variable name="resources" as="document-node()">
+            <xsl:document>
+                <rdf:RDF>
+                    <xsl:sequence select="ldh:triples-to-descriptions($triples)"/>
+                </rdf:RDF>
+            </xsl:document>
         </xsl:variable>
-        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+        <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $action)" as="xs:anyURI"/>
+        <!-- If-Match header checks preconditions, i.e. that the graph has not been modified in the meanwhile -->
+        <xsl:variable name="request" select="map{ 'method': $method, 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string, 'headers': map{ 'If-Match': $etag, 'Accept': 'application/rdf+xml', 'Cache-Control': 'no-cache' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'doc-uri': ac:absolute-path(ldh:base-uri(.)),
+            'block': $block,
+            'form': $form,
+            'modal': $modal,
+            'resources': $resources
+          }"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+            => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+            => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+            => ixsl:then(ldh:row-form-patch-response#1)
+        "/>
     </xsl:template>
     
     <!-- add new property to form -->
@@ -602,197 +880,343 @@ WHERE
         
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
     </xsl:template>
+
+    <xsl:function name="ldh:modal-form-patch-response" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+
+        <xsl:message>ldh:modal-form-patch-response</xsl:message>
+
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="status" select="$response?status" as="xs:double"/>
+        <xsl:variable name="media-type" select="$response?media-type" as="xs:string?"/>
+
+        <xsl:choose>
+            <xsl:when test="$status = (200, 204)">
+                <xsl:sequence select="ldh:modal-form-submit-success($context)"/>
+            </xsl:when>
+            <xsl:when test="$status = (400, 422) and starts-with($media-type, 'application/rdf+xml')">
+              <xsl:sequence select="ldh:modal-form-submit-violation($context)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="ldh:error-response-alert($context)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+
+    <xsl:function name="ldh:row-form-patch-response" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="status" select="$response?status" as="xs:double"/>
+        <xsl:variable name="media-type" select="$response?media-type" as="xs:string?"/>
+
+        <xsl:message>ldh:row-form-patch-response</xsl:message>
+
+        <xsl:choose>
+            <xsl:when test="$status = (200, 204)">
+                <xsl:sequence select="ldh:form-horizontal-submit-success($context)"/>
+            </xsl:when>
+            <xsl:when test="$status = (400, 422) and starts-with($media-type, 'application/rdf+xml')">
+              <xsl:sequence select="ldh:row-form-submit-violation($context)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="ldh:error-response-alert($context)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
     
-    <!-- after inline resource creation/editing form is submitted  -->
-    <xsl:template name="ldh:ResourceUpdated">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="doc-uri" as="xs:anyURI"/>
-        <xsl:param name="block" as="element()"/>
-        <xsl:param name="form" as="element()?"/>
-        <xsl:param name="modal" select="false()" as="xs:boolean"/>
-        <xsl:param name="resources" as="document-node()"/>
-
-        <xsl:apply-templates select="." mode="ldh:ProcessUpdateResponse">
-            <xsl:with-param name="doc-uri" select="$doc-uri"/>
-            <xsl:with-param name="block" select="$block"/>
-            <xsl:with-param name="form" select="$form"/>
-            <xsl:with-param name="modal" select="$modal"/>
-            <xsl:with-param name="resources" select="$resources"/>
-        </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template match=".[. instance of map(*)]" mode="ldh:ProcessUpdateResponse">
-        <xsl:param name="doc-uri" as="xs:anyURI"/>
-        <xsl:param name="block" as="element()"/>
-        <xsl:param name="form" as="element()?"/>
-        <xsl:param name="modal" select="false()" as="xs:boolean"/>
-        <xsl:param name="resources" as="document-node()"/>
+    <xsl:function name="ldh:form-horizontal-response" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="status" select="$response?status" as="xs:double"/>
+        <xsl:variable name="media-type" select="$response?media-type" as="xs:string?"/>
+        <xsl:variable name="modal" select="map:get($context, 'modal')" as="xs:boolean"/>
         
+        <xsl:message>ldh:form-horizontal-response</xsl:message>
+
         <xsl:choose>
-            <!-- POST data appended successfully -->
-            <xsl:when test="?status = (200, 204)">
-                <xsl:variable name="etag" select="?headers?etag" as="xs:string?"/>
-                <xsl:if test="$etag">
-                    <!-- store ETag header value under window.LinkedDataHub.contents[$doc-uri].etag -->
-                    <ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`')"/>
-                </xsl:if>
+            <xsl:when test="$status = (200, 204)">
+                <xsl:sequence select="ldh:form-horizontal-submit-success($context)"/>
+            </xsl:when>
+            <xsl:when test="$status = 201 and map:contains($response?headers, 'location')">
+                <xsl:sequence select="ldh:modal-form-submit-created($context)"/> <!-- 201 Created an only happen via PUT from modal form -->
+            </xsl:when>
+            <xsl:when test="$status = (400, 422) and starts-with($media-type, 'application/rdf+xml')">
+              <xsl:sequence select="ldh:modal-form-submit-violation($context)"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="ldh:error-response-alert($context)"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
+    <xsl:function name="ldh:form-horizontal-submit-success" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="doc-uri" select="$context('doc-uri')" as="xs:anyURI"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="form" select="$context('form')" as="element()?"/>
+        <xsl:variable name="modal" select="$context('modal')" as="xs:boolean"/>
+        <xsl:variable name="resources" select="$context('resources')" as="document-node()"/>
+
+        <xsl:message>ldh:form-horizontal-submit-success</xsl:message>
+        
+        <xsl:for-each select="$response">
+            <xsl:variable name="etag" select="?headers?etag" as="xs:string?"/>
+            <xsl:if test="$etag">
+                <!-- store ETag header value under window.LinkedDataHub.contents[$doc-uri].etag -->
+                <ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`')"/>
+            </xsl:if>
 
-                <xsl:variable name="classes" select="()" as="element()*"/>
-                <xsl:variable name="new-block" as="element()">
-                    <xsl:apply-templates select="$resources/rdf:RDF/*" mode="bs2:Row">
-                        <xsl:with-param name="classes" select="$classes"/>
-                        <xsl:with-param name="style" select="()"/> <!-- TO-DO: remove? -->
-                        <xsl:with-param name="type-content" select="false()"/>
-                        <xsl:sort select="ac:label(.)"/>
-                    </xsl:apply-templates>
-                </xsl:variable>
-                
-                <xsl:for-each select="$block">
-                    <!-- replace block element attributes TO-DO: shouldn't be necessary in SaxonJS 3 using method="ixsl:replace-element": https://saxonica.plan.io/issues/6303#note-2 -->
-                    <xsl:for-each select="@*">
-                        <ixsl:remove-attribute object="$block" name="{name()}"/>
-                    </xsl:for-each>
-                    <xsl:for-each select="$new-block/@*">
-                        <ixsl:set-attribute object="$block" name="{name()}" select="."/>
-                    </xsl:for-each>
-                    
-                    <xsl:result-document href="?." method="ixsl:replace-content">
-                        <xsl:copy-of select="$new-block/*"/>
-                    </xsl:result-document>
-                </xsl:for-each>
+            <xsl:variable name="classes" select="()" as="element()*"/>
+            <xsl:variable name="new-block" as="element()">
+                <xsl:apply-templates select="$resources/rdf:RDF/*" mode="bs2:Row">
+                    <xsl:with-param name="classes" select="$classes"/>
+                    <xsl:with-param name="style" select="()"/> <!-- TO-DO: remove? -->
+                    <xsl:with-param name="type-content" select="false()"/>
+                    <xsl:sort select="ac:label(.)"/>
+                </xsl:apply-templates>
+            </xsl:variable>
 
-                <!-- cannot be in $block context because it contains old DOM (pre-ixsl:replace-content) -->
-                <xsl:for-each select="id($block/@id, ixsl:page())">
-                    <xsl:apply-templates select="." mode="ldh:RenderRow"/>
+            <xsl:for-each select="$block">
+                <!-- replace block element attributes TO-DO: shouldn't be necessary in SaxonJS 3 using method="ixsl:replace-element": https://saxonica.plan.io/issues/6303#note-2 -->
+                <xsl:for-each select="@*">
+                    <ixsl:remove-attribute object="$block" name="{name()}"/>
+                </xsl:for-each>
+                <xsl:for-each select="$new-block/@*">
+                    <ixsl:set-attribute object="$block" name="{name()}" select="."/>
                 </xsl:for-each>
-                
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-            </xsl:when>
-            <!-- PUT created new document successfully, redirect to it -->
-            <xsl:when test="?status = 201 and ?headers?location">
-                <xsl:variable name="created-uri" select="?headers?location" as="xs:anyURI"/>
-                <xsl:variable name="request" as="item()*">
-                    <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $created-uri, 'headers': map{ 'Accept': 'application/xhtml+xml' } }">
-                        <xsl:call-template name="ldh:DocumentLoaded">
-                            <xsl:with-param name="href" select="$created-uri"/>
-                        </xsl:call-template>
-                    </ixsl:schedule-action>
-                </xsl:variable>
-
-                <!-- store the new request object -->
-                <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
-            </xsl:when>
-            <!-- POST or PUT constraint violation response is 422 Unprocessable Entity, bad RDF syntax is 400 Bad Request -->
-            <xsl:when test="?status = (400, 422) and starts-with(?media-type, 'application/rdf+xml')"> <!-- allow 'application/rdf+xml;charset=UTF-8' as well -->
-                <xsl:variable name="body" select="?body" as="document-node()"/>
-                <!-- TO-DO: refactor to use asynchronous HTTP requests -->
-                <xsl:variable name="types" select="distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/rdf:type/@rdf:resource)" as="xs:anyURI*"/>
-                <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="type-metadata" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
 
-                <xsl:variable name="property-uris" select="distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
-                <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="property-metadata" select="document($request-uri)" as="document-node()"/>
+                <xsl:result-document href="?." method="ixsl:replace-content">
+                    <xsl:copy-of select="$new-block/*"/>
+                </xsl:result-document>
+            </xsl:for-each>
 
-                <xsl:variable name="query-string" select="$constructor-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="constructors" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+            <!-- cannot be in $block context because it contains old DOM (pre-ixsl:replace-content) -->
+            <xsl:apply-templates select="id($block/@id, ixsl:page())" mode="ldh:RenderRow"/>
+            
+            <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+        </xsl:for-each>
+    </xsl:function>
 
-                <xsl:variable name="query-string" select="$constraint-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="constraints" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+    <xsl:function name="ldh:modal-form-submit-success" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
 
-                <xsl:variable name="query-string" select="$shape-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="shapes" select="document($request-uri)" as="document-node()"/>
+        <xsl:message>ldh:modal-form-submit-success</xsl:message>
 
-                <xsl:variable name="object-uris" select="distinct-values($body/rdf:RDF/*/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
-                <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
-                <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
-                <xsl:variable name="object-metadata" select="if (doc-available($request-uri)) then document($request-uri) else ()" as="document-node()?"/>
+        <xsl:for-each select="$response">
+            <xsl:variable name="href" select="ac:absolute-path(xs:anyURI(ixsl:location()))" as="xs:anyURI"/> <!-- TO-DO: pass $context?base-uri -->
+            <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $href, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
+            <xsl:variable name="context" select="map:merge((
+              $context,
+              map{
+                'request': $request,
+                'href': $href
+              }
+            ), map{ 'duplicates': 'use-last' })" as="map(*)"/>  
+            <ixsl:promise select="
+              ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+                => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+                => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+                => ixsl:then(ldh:xhtml-document-loaded#1)
+            "/>
+        </xsl:for-each>        
+    </xsl:function>
+    
+    <xsl:function name="ldh:modal-form-submit-created" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
 
-                <xsl:choose>
-                    <xsl:when test="$modal">
-                        <xsl:variable name="form" as="element()*">
-                            <xsl:for-each select="$body">
-                                <xsl:apply-templates select="." mode="bs2:Form"> <!-- document level template -->
-                                    <xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
-                                    <xsl:with-param name="method" select="$form/@method"/>
-                                    <xsl:with-param name="action" select="$form/@action" as="xs:anyURI"/>
-                                    <xsl:with-param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
-                                    <xsl:with-param name="classes" select="()"/>
-                                    <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
-                                    <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
-    <!--                                <xsl:with-param name="constructor" select="$constructed-doc" tunnel="yes"/>-->
-                                    <xsl:with-param name="constructors" select="()" tunnel="yes"/> <!-- can be empty because modal form is only used to create Container/Item instances -->
-                                    <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
-                                    <xsl:with-param name="shapes" select="()" tunnel="yes"/> <!-- there will be no shapes as modal form is only used to create Container/Item instances -->
-                                    <xsl:with-param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" tunnel="yes"/> <!-- ac:absolute-path(ldh:base-uri(.)) is empty on constructed documents -->
-                                    <!-- <xsl:sort select="ac:label(.)"/> -->
-                                </xsl:apply-templates>
-                            </xsl:for-each>
-                        </xsl:variable>
+        <xsl:message>ldh:modal-form-submit-created</xsl:message>
 
-                        <xsl:for-each select="$block">
-                            <xsl:result-document href="?." method="ixsl:replace-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close">&#215;</button>
+        <xsl:for-each select="$response">
+            <xsl:variable name="href" select="?headers?location" as="xs:anyURI"/>
+            <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $href, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
+            <xsl:variable name="context" as="map(*)" select="
+              map{
+                'request': $request,
+                'href': $href
+              }"/>
+            <ixsl:promise select="
+              ixsl:http-request($context('request'))                          (: Step 1: send initial request :)
+                => ixsl:then(ldh:rethread-response($context, ?))              (: Step 2: attach response to context :)
+                => ixsl:then(ldh:handle-response#1)                           (: Step 3: handle 429s, etc. :)
+                => ixsl:then(ldh:xhtml-document-loaded#1)
+            "/>
+        </xsl:for-each>        
+    </xsl:function>
+    
+    <xsl:function name="ldh:modal-form-submit-violation" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="doc-uri" select="$context('doc-uri')" as="xs:anyURI"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="form" select="$context('form')" as="element()?"/>
+        <xsl:variable name="modal" select="$context('modal')" as="xs:boolean"/>
+<!--        <xsl:variable name="resources" select="$context('resources')" as="document-node()"/>-->
+        
+        <xsl:message>ldh:modal-form-submit-violation</xsl:message>
 
-                                    <legend>
-                                        <!-- <xsl:value-of select="$legend-label"/> -->
-                                    </legend>
-                                </div>
+        <xsl:for-each select="$response">
+            <xsl:variable name="body" select="?body" as="document-node()"/>
+            <!-- TO-DO: refactor to use asynchronous HTTP requests -->
+            <!-- inverse $types expression compared to ldh:row-form-submit-violation -->
+            <xsl:variable name="types" select="distinct-values($body/rdf:RDF/*[@rdf:about = $doc-uri]/rdf:type/@rdf:resource)" as="xs:anyURI*"/>
+            <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="type-metadata" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
 
-                                <div class="modal-body">
-                                    <xsl:copy-of select="$form"/>
-                                </div>
-                            </xsl:result-document>
-                        </xsl:for-each>
-                        
-                    <!-- cannot be in $form context because it contains old DOM (pre-ixsl:replace-content) -->
-                        <xsl:for-each select="id($form/@id, ixsl:page())">
-                            <xsl:apply-templates select="." mode="ldh:RenderRowForm"/>
-                        </xsl:for-each>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:variable name="row-form" as="node()*">
-                            <!-- filter out the current document which might be in the constraint violation response attached by an rdf:_N property to a block resource -->
-                            <xsl:apply-templates select="$body/rdf:RDF/*[not(@rdf:about = $doc-uri)]" mode="bs2:RowForm">
-                                <xsl:with-param name="method" select="$form/@method"/>
-                                <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
-                                <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
-                                <xsl:with-param name="constructors" select="$constructors" tunnel="yes"/>
-                                <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
-                                <xsl:with-param name="shapes" select="$shapes" tunnel="yes"/>
-                                <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
-                            </xsl:apply-templates>
-                        </xsl:variable>
-                        
-                        <xsl:for-each select="$block">
-                            <xsl:result-document href="?." method="ixsl:replace-content">
-                                <xsl:copy-of select="$row-form/*"/>
-                            </xsl:result-document>
-                        </xsl:for-each>
-                        
-                        <!-- cannot be in $block context because it contains old DOM (pre-ixsl:replace-content) -->
-                        <xsl:for-each select="id($block/@id, ixsl:page())">
-                            <xsl:apply-templates select="." mode="ldh:RenderRowForm"/>
-                        </xsl:for-each>
-                    </xsl:otherwise>
-                </xsl:choose>
+            <xsl:variable name="property-uris" select="distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
+            <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="property-metadata" select="document($request-uri)" as="document-node()"/>
 
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-            </xsl:when>
-            <!-- error response -->
-            <xsl:otherwise>
-                <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
+            <xsl:variable name="query-string" select="$constructor-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="constructors" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="query-string" select="$constraint-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="constraints" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="query-string" select="$shape-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="shapes" select="document($request-uri)" as="document-node()"/>
+
+            <xsl:variable name="object-uris" select="distinct-values($body/rdf:RDF/*/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
+            <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="object-metadata" select="if (doc-available($request-uri)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="form" as="element()*">
+                <xsl:for-each select="$body">
+                    <xsl:apply-templates select="." mode="bs2:Form"> <!-- document level template -->
+                        <xsl:with-param name="about" select="()"/> <!-- don't set @about on the container until after the resource is saved -->
+                        <xsl:with-param name="method" select="$form/@method"/>
+                        <xsl:with-param name="action" select="$form/@action" as="xs:anyURI"/>
+                        <xsl:with-param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
+                        <xsl:with-param name="classes" select="()"/>
+                        <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
+                        <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
+                        <xsl:with-param name="constructors" select="()" tunnel="yes"/> <!-- can be empty because modal form is only used to create Container/Item instances -->
+                        <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
+                        <xsl:with-param name="shapes" select="()" tunnel="yes"/> <!-- there will be no shapes as modal form is only used to create Container/Item instances -->
+                        <xsl:with-param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" tunnel="yes"/> <!-- ac:absolute-path(ldh:base-uri(.)) is empty on constructed documents -->
+                        <!-- <xsl:sort select="ac:label(.)"/> -->
+                    </xsl:apply-templates>
+                </xsl:for-each>
+            </xsl:variable>
+
+            <xsl:for-each select="$block">
+                <xsl:result-document href="?." method="ixsl:replace-content">
+                    <div class="modal-header">
+                        <button type="button" class="close">&#215;</button>
+
+                        <legend>
+                            <!-- <xsl:value-of select="$legend-label"/> -->
+                        </legend>
+                    </div>
+
+                    <div class="modal-body">
+                        <xsl:copy-of select="$form"/>
+                    </div>
+                </xsl:result-document>
+            </xsl:for-each>
+
+        <!-- cannot be in $form context because it contains old DOM (pre-ixsl:replace-content) -->
+            <xsl:for-each select="id($form/@id, ixsl:page())">
+                <xsl:apply-templates select="." mode="ldh:RenderRowForm"/>
+            </xsl:for-each>
+
+            <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>            
+        </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
+    </xsl:function>
     
+    <xsl:function name="ldh:row-form-submit-violation" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="doc-uri" select="$context('doc-uri')" as="xs:anyURI"/>
+        <xsl:variable name="block" select="$context('block')" as="element()"/>
+        <xsl:variable name="form" select="$context('form')" as="element()?"/>
+        <xsl:variable name="modal" select="$context('modal')" as="xs:boolean"/>
+<!--        <xsl:variable name="resources" select="$context('resources')" as="document-node()"/>-->
+        
+        <xsl:message>ldh:row-form-submit-violation</xsl:message>
+
+        <xsl:for-each select="$response">
+            <xsl:variable name="body" select="?body" as="document-node()"/>
+            <!-- TO-DO: refactor to use asynchronous HTTP requests -->
+            <xsl:variable name="types" select="distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/rdf:type/@rdf:resource)" as="xs:anyURI*"/>
+            <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="type-metadata" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="property-uris" select="distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
+            <xsl:variable name="query-string" select="'DESCRIBE $Type VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="property-metadata" select="document($request-uri)" as="document-node()"/>
+
+            <xsl:variable name="query-string" select="$constructor-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="constructors" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="query-string" select="$constraint-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/sparql-results+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="constraints" select="if (exists($types)) then document($request-uri) else ()" as="document-node()?"/>
+
+            <xsl:variable name="query-string" select="$shape-query || ' VALUES $Type { ' || string-join(for $type in $types return '&lt;' || $type || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="shapes" select="document($request-uri)" as="document-node()"/>
+
+            <xsl:variable name="object-uris" select="distinct-values($body/rdf:RDF/*/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
+            <xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+            <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $query-string, 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+            <xsl:variable name="object-metadata" select="if (doc-available($request-uri)) then document($request-uri) else ()" as="document-node()?"/>
+            <xsl:variable name="row-form" as="node()*">
+                <!-- filter out the current document which might be in the constraint violation response attached by an rdf:_N property to a block resource -->
+                <xsl:apply-templates select="$body/rdf:RDF/*[not(@rdf:about = $doc-uri)]" mode="bs2:RowForm">
+                    <xsl:with-param name="method" select="$form/@method"/>
+                    <xsl:with-param name="type-metadata" select="$type-metadata" tunnel="yes"/>
+                    <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
+                    <xsl:with-param name="constructors" select="$constructors" tunnel="yes"/>
+                    <xsl:with-param name="constraints" select="$constraints" tunnel="yes"/>
+                    <xsl:with-param name="shapes" select="$shapes" tunnel="yes"/>
+                    <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
+                </xsl:apply-templates>
+            </xsl:variable>
+
+            <xsl:for-each select="$block">
+                <xsl:result-document href="?." method="ixsl:replace-content">
+                    <xsl:copy-of select="$row-form/*"/>
+                </xsl:result-document>
+            </xsl:for-each>
+
+            <!-- cannot be in $block context because it contains old DOM (pre-ixsl:replace-content) -->
+            <xsl:for-each select="id($block/@id, ixsl:page())">
+                <xsl:apply-templates select="." mode="ldh:RenderRowForm"/>
+            </xsl:for-each>
+
+            <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>            
+        </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
+    </xsl:function>
+
+    <xsl:function name="ldh:replace-content" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+
+        <xsl:variable name="target" select="$context('target')" as="element()"/>
+        <xsl:variable name="content" select="$context('content')" as="item()*"/>
+
+        <xsl:result-document href="?." method="ixsl:replace-content">
+          <xsl:copy-of select="$content"/>
+        </xsl:result-document>
+
+        <xsl:sequence select="$context"/>
+    </xsl:function>
+
     <!-- toggles the .control-group for subject URI/bnode ID editing -->
     <xsl:template match="button[contains-token(@class, 'btn-edit-subj')]" mode="ixsl:onclick">
         <!-- subject .control group is the first one after <legend> -->
@@ -1259,7 +1683,7 @@ WHERE
     </xsl:template>
     
     <!-- remove the whole div.row-fluid containing the form -->
-    <xsl:template match="div[contains-token(@class, 'row-fluid')]//button[contains-token(@class, 'btn-remove-resource')]" mode="ixsl:onclick" priority="2">
+    <xsl:template match="div[ancestor::div[contains-token(@class, 'block')]]//form//button[contains-token(@class, 'btn-remove-resource')]" mode="ixsl:onclick" priority="2">
         <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:variable name="about" select="$block/@about" as="xs:anyURI?"/>
         <xsl:variable name="form" select="ancestor::form" as="element()"/>
@@ -1525,15 +1949,16 @@ WHERE
                 </xsl:map-entry>
             </xsl:map>
         </xsl:variable>
-        
-        <xsl:for-each select="$response">
-            <xsl:call-template name="ldh:ResourceUpdated">
-                <xsl:with-param name="doc-uri" select="$doc-uri"/>
-                <xsl:with-param name="block" select="$block"/>
-                <xsl:with-param name="form" select="$form"/>
-                <xsl:with-param name="resources" select="$resources"/>
-            </xsl:call-template>
-        </xsl:for-each>
+            
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'response': $response,
+            'doc-uri': $doc-uri,
+            'block': $block,
+            'form': $form,
+            'resources': $resources
+          }"/>
+        <xsl:sequence select="ldh:form-horizontal-response($context)"/>
     </xsl:template>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
index bd00d5084..1a19aa7ef 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
@@ -400,24 +400,38 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="ixsl:call($js-function, 'call', [ (), $doc ])"/>
     </xsl:function>
     
-    <!-- builds SPARQL update by injecting SPARQL.js triples into the INSERT block -->
-
-    <xsl:function name="ldh:triples-to-sparql-update" as="xs:string">
+    <!-- builds an <$about> ?p ?o triple pattern for the given $about URI -->
+    
+    <xsl:function name="ldh:uri-po-pattern" as="element()*">
         <xsl:param name="about" as="xs:anyURI"/>
+
+        <json:map>
+            <json:string key="subject"><xsl:sequence select="$about"/></json:string>
+            <json:string key="predicate">?p</json:string>
+            <json:string key="object">?o</json:string>
+        </json:map>
+    </xsl:function>
+    
+    <!-- wraps triple pattern into BGP pattern -->
+    
+    <xsl:function name="ldh:triples-to-bgp" as="element()">
         <xsl:param name="triples" as="element()*"/>
-        
-        <xsl:variable name="where-pattern" as="element()">
-            <json:map>
-                <json:string key="type">bgp</json:string>
-                <json:array key="triples">
-                    <json:map>
-                        <json:string key="subject"><xsl:sequence select="$about"/></json:string>
-                        <json:string key="predicate">?p</json:string>
-                        <json:string key="object">?o</json:string>
-                    </json:map>
-                </json:array>
-            </json:map>
-        </xsl:variable>
+
+        <json:map>
+            <json:string key="type">bgp</json:string>
+            <json:array key="triples">
+                <xsl:sequence select="$triples"/>
+            </json:array>
+        </json:map>
+    </xsl:function>
+    
+    <!-- builds SPARQL update by injecting SPARQL.js triples into the INSERT block -->
+
+    <xsl:function name="ldh:insertdelete-update" as="xs:string">
+        <xsl:param name="delete-pattern" as="element()*"/>
+        <xsl:param name="insert-pattern" as="element()*"/>
+        <xsl:param name="where-pattern" as="element()*"/>
+
         <xsl:variable name="update-xml" as="element()">
             <json:map>
                 <json:string key="type">update</json:string>
@@ -425,15 +439,10 @@ exclude-result-prefixes="#all"
                     <json:map>
                         <json:string key="updateType">insertdelete</json:string>
                         <json:array key="delete">
-                            <xsl:sequence select="$where-pattern"/>
+                            <xsl:sequence select="$delete-pattern"/>
                         </json:array>
                         <json:array key="insert">
-                            <json:map>
-                                <json:string key="type">bgp</json:string>
-                                <json:array key="triples">
-                                    <xsl:sequence select="$triples"/>
-                                </json:array>
-                            </json:map>
+                            <xsl:sequence select="$insert-pattern"/>
                         </json:array>
                         <json:array key="where">
                             <xsl:sequence select="$where-pattern"/>
@@ -450,36 +459,72 @@ exclude-result-prefixes="#all"
     <!-- generic HTTP client promises (SaxonJS 3) -->
 
     <xsl:function name="ldh:handle-response" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="response" as="map(*)"/>
-        <xsl:variable name="default-retry-after" select="1" as="xs:integer"/>
+      <xsl:param name="context" as="map(*)"/>
 
-        <xsl:choose>
-            <xsl:when test="$response?status = 429">
-                <xsl:variable name="retry-after" select="
-                  if (map:contains($response?headers, 'Retry-After')) 
-                  then xs:integer($response?headers('Retry-After')) 
-                  else $default-retry-after"/>
-
-                <xsl:sequence select="
-                  ixsl:sleep($retry-after * 1000)
-                    => ixsl:then(ldh:retry-request($request, ?))
-                "/>
-          </xsl:when>
-            <xsl:otherwise>
-                <xsl:sequence select="$response"/>
-            </xsl:otherwise>
-        </xsl:choose>
+      <xsl:variable name="request" select="$context('request')" as="map(*)"/>
+      <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+      <xsl:variable name="default-retry-after" select="1" as="xs:integer"/>
+
+      <xsl:choose>
+        <xsl:when test="$response?status = 429">
+          <xsl:variable name="retry-after" select="
+            if (map:contains($response?headers, 'Retry-After')) 
+            then xs:integer($response?headers('Retry-After')) 
+            else $default-retry-after"/>
+
+          <xsl:sequence select="
+            ixsl:sleep($retry-after * 1000)
+                => ixsl:then(ldh:retry-request($context, ?))
+          "/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:sequence select="$context"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:function>
 
     <xsl:function name="ldh:retry-request" as="item()*" ixsl:updating="yes">
-        <xsl:param name="request" as="map(*)"/>
-        <xsl:param name="sleep-result" as="item()?"/>
+      <xsl:param name="context" as="map(*)"/>
+      <xsl:param name="sleep-result" as="item()?"/>
+
+      <xsl:variable name="request" select="$context('request')"/>
+
+      <xsl:sequence select="
+        ixsl:http-request($request)
+          => ixsl:then(ldh:rethread-response($context, ?))
+          => ixsl:then(ldh:handle-response#1)
+      "/>
+    </xsl:function>
+    
+    <xsl:function name="ldh:rethread-response" as="map(*)" ixsl:updating="no">
+      <xsl:param name="context" as="map(*)"/>
+      <xsl:param name="response" as="map(*)"/>
+
+      <xsl:sequence select="map:merge(($context, map{ 'response': $response }), map{ 'duplicates': 'use-last' })"/>
+    </xsl:function>
+
+    <xsl:function name="ldh:http-request-threaded" as="map(*)" ixsl:updating="yes">
+      <xsl:param name="context" as="map(*)"/>
+
+      <xsl:sequence select="
+        ixsl:http-request($context('request'))
+          => ixsl:then(ldh:rethread-response($context, ?))
+      "/>
+    </xsl:function>
+    
+    <xsl:function name="ldh:promise-failure" ixsl:updating="yes">
+        <xsl:param name="error" as="map(*)"/>
+
+        <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+        <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ $error?message ])"/>
+    </xsl:function>
+    
+    <xsl:function name="ldh:error-response-alert" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)?"/>
 
-        <xsl:sequence select="
-          ixsl:http-request($request)
-            => ixsl:then(ldh:handle-response($request, ?))
-        "/>
+        <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+        <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ $response?message ])"/>
     </xsl:function>
     
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/map.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/map.xsl
index a12ae17dc..7646e5d33 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/map.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/map.xsl
@@ -126,7 +126,7 @@ exclude-result-prefixes="#all"
         <xsl:param name="select-xml" as="document-node()"/>
         <xsl:param name="endpoint" as="xs:anyURI"/>
         <xsl:param name="base-uri" as="xs:anyURI"/>
-
+        
         <!-- wrap SELECT into a DESCRIBE -->
         <xsl:variable name="query-xml" as="element()">
             <xsl:apply-templates select="$select-xml" mode="ldh:wrap-describe"/>
@@ -136,14 +136,19 @@ exclude-result-prefixes="#all"
         <xsl:variable name="query-string" select="ixsl:call(ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromQuery', [ $query-json ]), 'toString', [])" as="xs:string"/>
         <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': $query-string })" as="xs:anyURI"/>
         <xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path($base-uri), map{}, $results-uri)" as="xs:anyURI"/>
-
-        <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
-            <xsl:call-template name="onGeoResultsLoad">
-                <xsl:with-param name="container" select="$container"/>
-                <xsl:with-param name="container-id" select="$container-id"/>
-                <xsl:with-param name="block-uri" select="$block-uri"/>
-            </xsl:call-template>
-        </ixsl:schedule-action>
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:variable name="context" as="map(*)" select="
+          map{
+            'request': $request,
+            'container': $container,
+            'container-id': $container-id,
+            'block-uri': $block-uri
+          }"/>
+        <ixsl:promise select="ixsl:http-request($context('request')) =>
+            ixsl:then(ldh:rethread-response($context, ?)) =>
+            ixsl:then(ldh:handle-response#1) =>
+            ixsl:then(ldh:geo-results-response#1)"
+            on-failure="ldh:promise-failure#1"/>
     </xsl:template>
     
     <!-- create and render OpenLayers map -->
@@ -321,35 +326,40 @@ exclude-result-prefixes="#all"
     <!-- CALLBACKS -->
     
     <!-- when container RDF/XML results load, render them -->
-    <xsl:template name="onGeoResultsLoad">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="container" as="element()"/>
-        <xsl:param name="container-id" as="xs:string"/>
-        <xsl:param name="block-uri" select="xs:anyURI($container/@about)" as="xs:anyURI"/>
+    <xsl:function name="ldh:geo-results-response" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+        <xsl:variable name="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="container-id" select="$context('container-id')" as="xs:string"/>
+        <xsl:variable name="block-uri" select="$context('block-uri')" as="xs:anyURI"/>
         
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
         
-        <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
-                <xsl:for-each select="?body">
-                    <xsl:call-template name="ldh:DrawMap">
-                        <xsl:with-param name="block-uri" select="$block-uri"/>
-                        <xsl:with-param name="canvas-id" select="$container-id || '-map-canvas'"/>
+        <xsl:for-each select="$response">
+            <xsl:choose>
+                <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
+                    <xsl:for-each select="?body">
+                        <xsl:call-template name="ldh:DrawMap">
+                            <xsl:with-param name="block-uri" select="$block-uri"/>
+                            <xsl:with-param name="canvas-id" select="$container-id || '-map-canvas'"/>
+                        </xsl:call-template>
+                    </xsl:for-each>
+                </xsl:when>
+                <xsl:otherwise>
+                    <!-- error response - could not load query results -->
+                    <xsl:call-template name="render-container-error">
+                        <xsl:with-param name="container" select="$container"/>
+                        <xsl:with-param name="message" select="?message"/>
                     </xsl:call-template>
-                </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- error response - could not load query results -->
-                <xsl:call-template name="render-container-error">
-                    <xsl:with-param name="container" select="$container"/>
-                    <xsl:with-param name="message" select="?message"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
         
         <!-- loading is done - restore the default mouse cursor -->
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-    </xsl:template>
+        
+        <xsl:sequence select="$context"/>
+    </xsl:function>
 
     <xsl:template match="." mode="ixsl:onMapMarkerClick">
         <xsl:param name="event" select="ixsl:event()"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/dct.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/dct.xsl
index ef090bf22..c5107e9fa 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/dct.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/dct.xsl
@@ -25,20 +25,21 @@ xmlns:dct="&dct;"
 xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
 exclude-result-prefixes="#all">
 
+    <xsl:preserve-space elements="dct:description"/>
+    
+    <xsl:template match="dct:description/text()" mode="bs2:FormControl">
+        <xsl:param name="type-label" select="true()" as="xs:boolean"/>
+        <xsl:param name="rows" select="10" as="xs:integer"/>
+        
+        <textarea name="ol" id="{generate-id()}" rows="{$rows}">
+            <xsl:value-of select="."/>
+        </textarea>
 
-    <!-- hide the dct:created/dct:modified properties of graph resources (dct:modified is set automatically by the Graph Store) -->
-    <xsl:template match="*[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/dct:created | *[rdf:type/@rdf:resource = ('&def;Root', '&dh;Container', '&dh;Item')]/dct:modified | *[rdf:type/@rdf:resource = ('&adm;Root', '&dh;Container', '&dh;Item')]/dct:created | *[rdf:type/@rdf:resource = ('&adm;Root', '&dh;Container', '&dh;Item')]/dct:modified" mode="bs2:FormControl" priority="1">
-        <xsl:apply-templates select="." mode="xhtml:Input">
-            <xsl:with-param name="type" select="'hidden'"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="node() | @rdf:resource | @rdf:nodeID" mode="xhtml:Input">
-            <xsl:with-param name="type" select="'hidden'"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="@xml:lang | @rdf:datatype" mode="xhtml:Input">
-            <xsl:with-param name="type" select="'hidden'"/>
-        </xsl:apply-templates>
+        <xsl:if test="$type-label">
+            <xsl:apply-templates select="." mode="bs2:FormControlTypeLabel"/>
+        </xsl:if>
     </xsl:template>
-
+    
     <xsl:template match="dct:format/@rdf:nodeID" mode="bs2:FormControl">
         <xsl:param name="id" select="generate-id()" as="xs:string"/>
         <xsl:param name="class" as="xs:string?"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index 0e92d2feb..22cc4faf5 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -626,11 +626,15 @@ LIMIT   100
             <div class="row-fluid">
                 <xsl:apply-templates select="." mode="bs2:BreadCrumbBar"/>
                 
-                <div id="created-modified-date" class="span3">
-                    <p>
-                        <xsl:apply-templates select="key('resources', ac:absolute-path(ldh:base-uri(.)))" mode="bs2:Timestamp"/>
-                    </p>
-                </div>
+                <div id="doc-controls" class="span3">
+                    <xsl:apply-templates select="key('resources', ac:absolute-path(ldh:base-uri(.)))" mode="bs2:Timestamp"/>
+
+                    <xsl:if test="$acl:mode = '&acl;Write'">
+                        <button type="button" class="btn btn-edit pull-right">
+                            <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
+                        </button>
+                    </xsl:if>
+                </div>                
             </div>
         </div>
     </xsl:template>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
index 747984e32..a6c5ab7bb 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -701,6 +701,75 @@ WHERE
     
     <!-- Linked Data browser -->
     
+    <xsl:function name="ldh:xhtml-document-loaded" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:message>ldh:xhtml-document-loaded</xsl:message>
+
+        <xsl:variable name="href" select="$context('href')" as="xs:anyURI?"/> <!-- absolute URI! -->
+        <xsl:variable name="service-uri" select="if (id('search-service', ixsl:page())) then xs:anyURI(ixsl:get(id('search-service', ixsl:page()), 'value')) else ()" as="xs:anyURI?"/>
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="push-state" select="true()" as="xs:boolean"/>
+        <xsl:variable name="refresh-content" as="xs:boolean?"/>
+        <!-- $graph defaults to ac:absolute-path($href), $uri defaults to $graph -->
+        <xsl:variable name="graph" select="if (exists(ixsl:query-params()?graph)) then xs:anyURI(ixsl:query-params()?graph[1]) else ac:absolute-path($href)" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="if (exists(ixsl:query-params()?uri)) then xs:anyURI(ixsl:query-params()?uri[1]) else $graph" as="xs:anyURI"/>
+        <xsl:variable name="response" select="$context('response')" as="map(*)"/>
+
+        <!-- set #uri value -->
+        <xsl:for-each select="id('uri', ixsl:page())">
+            <ixsl:set-property name="value" select="if (not(starts-with($uri, $ldt:base))) then $uri else ()" object="."/>
+        </xsl:for-each>
+        
+        <xsl:for-each select="$response">
+            <xsl:choose>
+                <xsl:when test="?status = 0">
+                    <!-- HTTP request was terminated - do nothing -->
+                </xsl:when>
+                <xsl:when test="starts-with(?media-type, 'application/xhtml+xml')">
+                    <xsl:variable name="endpoint-link" select="tokenize(?headers?link, ',')[contains(., '&sd;endpoint')]" as="xs:string?"/>
+                    <xsl:variable name="endpoint" select="if ($endpoint-link) then xs:anyURI(substring-before(substring-after(substring-before($endpoint-link, ';'), '&lt;'), '&gt;')) else ()" as="xs:anyURI?"/>
+                    <xsl:variable name="base-link" select="tokenize(?headers?link, ',')[contains(., '&ldt;base')]" as="xs:string?"/>
+                    <!-- set new base URI if the current app has changed -->
+                    <xsl:if test="$base-link">
+                        <xsl:variable name="base" select="xs:anyURI(substring-before(substring-after(substring-before($base-link, ';'), '&lt;'), '&gt;'))" as="xs:anyURI"/>
+                        <xsl:if test="not($base = ldt:base())">
+                            <xsl:message>Application change. Base URI: <xsl:value-of select="$base"/></xsl:message>
+                            <xsl:call-template name="ldt:AppChanged">
+                                <xsl:with-param name="base" select="$base"/>
+                            </xsl:call-template>
+                        </xsl:if>
+                        <ixsl:set-property name="base" select="$base" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
+                    </xsl:if>
+
+                    <xsl:apply-templates select="?body" mode="ldh:HTMLDocumentLoaded">
+                        <xsl:with-param name="href" select="$href"/>
+                        <xsl:with-param name="endpoint" select="$endpoint"/>
+                        <xsl:with-param name="container" select="id($body-id, ixsl:page())"/>
+                        <xsl:with-param name="push-state" select="$push-state"/>
+                        <xsl:with-param name="refresh-content" select="$refresh-content"/>
+                    </xsl:apply-templates>
+                </xsl:when>
+                <xsl:otherwise>
+                    <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+
+                    <!-- error response - could not load document -->
+                    <xsl:result-document href="#content-body" method="ixsl:replace-content">
+                        <div class="alert alert-block">
+                            <strong>Error loading XHTML document</strong>
+                            <xsl:if test="$response?message">
+                                <pre>
+                                    <xsl:value-of select="$response?message"/>
+                                </pre>
+                            </xsl:if>
+                        </div>
+                    </xsl:result-document>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+        
+        <xsl:sequence select="$context"/>
+    </xsl:function>
+    
     <xsl:template name="ldh:DocumentLoaded">
         <xsl:context-item as="map(*)" use="required"/>
         <xsl:param name="href" as="xs:anyURI?"/> <!-- absolute URI! -->
@@ -1239,7 +1308,7 @@ WHERE
             <xsl:with-param name="graph" select="ac:absolute-path(ldh:base-uri(.))"/>
         </xsl:call-template>
     </xsl:template>
-
+    
     <!-- document mode tabs -->
     
     <xsl:template match="div[@id = 'content-body']/div/ul[contains-token(@class, 'nav-tabs')]/li[not(contains-token(@class, 'active'))]/a" mode="ixsl:onclick">