From 2a75032f6b957d5efe437b7ed94d0e92f90dcf6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Mon, 18 May 2026 22:50:25 +0200
Subject: [PATCH 1/2] Thread doc-uri / fragment / mode separately across
 navigation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The client-side navigation pipeline overloaded a single $uri to mean
both "doc to fetch/cache" and "resource to display." Different
consumers silently stripped or kept different parts, surfacing as:
blank panes on fragment-bearing link clicks, mode toggles ignored
when the doc was cached, URL bar gaining a re-encoded fragment after
forth-and-back navigation across the local tab.

Split into explicit components, threaded through every entry point:

- $doc-uri (no fragment, no query) — cache key
  (LinkedDataHub.contents), tab <li> data-uri, pane @about, every
  lookup predicate. Always via ac:absolute-path.
- $fragment — the sub-anchor; lives on the outer URL per RFC 3986,
  extracted via ac:fragment-id($href). Round-tripped through tab
  @href via the 3-arity ldh:href.
- $query-params — mode/forClass/etc.; callers strip the URL fragment
  via ac:document-uri before passing to ldh:parse-query-params, so
  no caller can corrupt the last value by gluing the fragment onto it.

Touched: ldh:DocumentNavigate, ldh:RDFDocumentLoad,
ldh:rdf-document-response, ldh:RenderTab, ldh:ActivateTab,
ldh:TabSwitch, ldh:AddTabNavBarListItem; the four event handlers
(main, link click, tab click, popstate), close-tab fallback,
navbar-form, onDelete, onRDFFileUpload; modal/form callers in
bootstrap/2.3.2/client. bs2:TabBody and bs2:DocumentBody now take
@about as a mandatory param; the no-op ixsl:set-attribute workaround
(operating on a detached node after ixsl:replace-element) is removed;
layout.xsl passes @about server-side.

TabSwitch gate requires cache hit AND non-uri query params unchanged
(deep-equal vs ldh:query-params()); mode changes correctly fall
through to DocumentNavigate, so the rendered DOM gets refreshed.

ldh:query-params is now defined once (imports/default.xsl); the
client-side override that wrapped ixsl:query-params() shadowed
fragment-safe parsing and is removed. The remaining direct
ixsl:query-params() callers (ac:query stylesheet param,
navigation.xsl mode tunnel) go through ldh:query-params() too.

Anchor-emitting server templates (xhtml:Anchor, svg:Anchor,
@rdf:resource|srx:uri) drop the encoded-full-URI fragment convention:
$fragment = ac:fragment-id(.), $href via ac:document-uri. External
resource links become ?uri=<doc-uri>#<frag> instead of
?uri=<doc-uri%23frag>#<encoded-full-uri>.

Scroll-to-fragment in RenderTab and TabSwitch uses
[@about = $resource-uri] in the active pane, replacing
id($fragment, ixsl:page()). Sidesteps the DOM-id uniqueness
constraint when two panes both render a resource at #this — the
RDFa-emitted @about is resource-URI-scoped, naturally unique.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../xsl/bootstrap/2.3.2/client/form.xsl       |   5 +-
 .../xsl/bootstrap/2.3.2/client/functions.xsl  |   4 +-
 .../xsl/bootstrap/2.3.2/client/modal.xsl      |   9 +-
 .../xsl/bootstrap/2.3.2/client/navigation.xsl |   2 +-
 .../xsl/bootstrap/2.3.2/document.xsl          |   8 +-
 .../xsl/bootstrap/2.3.2/imports/default.xsl   |  17 +-
 .../xsl/bootstrap/2.3.2/layout.xsl            |   1 +
 .../atomgraph/linkeddatahub/xsl/client.xsl    | 295 +++++++++++-------
 8 files changed, 208 insertions(+), 133 deletions(-)

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 1beb13af6..06dcc79de 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
@@ -762,9 +762,10 @@ WHERE
             <xsl:variable name="href" select="?headers?location" as="xs:anyURI"/>
 
             <xsl:call-template name="ldh:DocumentNavigate">
-                <xsl:with-param name="uri" select="$href"/>
+                <xsl:with-param name="doc-uri" select="ac:absolute-path($href)"/>
+                <xsl:with-param name="fragment" select="ac:fragment-id($href)"/>
             </xsl:call-template>
-        </xsl:for-each>        
+        </xsl:for-each>
     </xsl:function>
     
     <xsl:function name="ldh:row-form-submit-violation" ixsl:updating="yes">
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 7abc08c11..9f038a167 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
@@ -41,9 +41,7 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="xs:anyURI(ixsl:location())"/>
     </xsl:function>
 
-    <xsl:function name="ldh:query-params" as="map(xs:string, xs:string*)">
-        <xsl:sequence select="ixsl:query-params()"/>
-    </xsl:function>
+    <!-- ldh:query-params is defined once in imports/default.xsl and works in both contexts via ldh:request-uri -->
 
     <xsl:function name="ldh:base-uri" as="xs:anyURI">
         <xsl:param name="arg" as="node()"/> <!-- ignored -->
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
index 2dcd28caa..dd0dd7e55 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
@@ -1272,7 +1272,8 @@ LIMIT   10
                 <xsl:variable name="form" select="$context('form')" as="element()?"/>
                 <xsl:sequence select="ixsl:call($form/ancestor::div[contains-token(@class, 'modal')], 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="$doc-uri"/>
+                    <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                    <xsl:with-param name="fragment" select="()"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:when test="$status = 201 and map:contains($response?headers, 'location')">
@@ -1571,7 +1572,8 @@ LIMIT   10
                 <xsl:sequence select="ixsl:call($form/ancestor::div[contains-token(@class, 'modal')], 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
 
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="ac:absolute-path($uri)"/>
+                    <xsl:with-param name="doc-uri" select="ac:absolute-path($uri)"/>
+                    <xsl:with-param name="fragment" select="ac:fragment-id($uri)"/>
                 </xsl:call-template>
             </xsl:when>
             <!-- Error -->
@@ -1598,7 +1600,8 @@ LIMIT   10
                 <xsl:sequence select="ixsl:call($form/ancestor::div[contains-token(@class, 'modal')], 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
 
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="ac:absolute-path($uri)"/>
+                    <xsl:with-param name="doc-uri" select="ac:absolute-path($uri)"/>
+                    <xsl:with-param name="fragment" select="ac:fragment-id($uri)"/>
                 </xsl:call-template>
             </xsl:when>
             <!-- Error: render error message inline in the form's fieldset -->
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
index 694a66207..3c28670c9 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
@@ -667,7 +667,7 @@ ORDER BY DESC(?created)
                             <ul class="well well-small nav nav-list">
                                 <xsl:apply-templates select="$results/rdf:RDF/rdf:Description[not(@rdf:about = $doc-uri)]" mode="xhtml:ListItem">
                                     <xsl:sort select="ac:label(.)" order="ascending" lang="{$ldt:lang}"/>
-                                    <xsl:with-param name="mode" select="ixsl:query-params()?mode[1]" tunnel="yes"/> <!-- TO-DO: support multiple modes -->
+                                    <xsl:with-param name="mode" select="ldh:query-params()?mode[1]" tunnel="yes"/> <!-- TO-DO: support multiple modes -->
                                     <xsl:with-param name="render-id" select="false()" tunnel="yes"/>
                                 </xsl:apply-templates>
                             </ul>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
index 59225f296..602f877f3 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
@@ -419,6 +419,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="base" as="xs:anyURI?"/>
         <xsl:param name="endpoint" as="xs:anyURI?"/>
         <xsl:param name="application" as="xs:anyURI?"/>
+        <xsl:param name="about" as="xs:anyURI"/>
         <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
 
         <div>
@@ -444,6 +445,7 @@ extension-element-prefixes="ixsl"
 
             <xsl:apply-templates select="." mode="bs2:DocumentBody">
                 <xsl:with-param name="mode" select="$mode"/>
+                <xsl:with-param name="about" select="$about"/>
             </xsl:apply-templates>
         </div>
     </xsl:template>
@@ -454,7 +456,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="id" as="xs:string?"/>
         <xsl:param name="class" select="'document-body'" as="xs:string?"/>
         <xsl:param name="mode" as="xs:anyURI"/>
-        <xsl:param name="about" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
+        <xsl:param name="about" as="xs:anyURI"/>
         <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
 
         <div>
@@ -464,9 +466,7 @@ extension-element-prefixes="ixsl"
             <xsl:if test="$class">
                 <xsl:attribute name="class" select="$class"/>
             </xsl:if>
-            <xsl:if test="$about">
-                <xsl:attribute name="about" select="$about"/>
-            </xsl:if>
+            <xsl:attribute name="about" select="$about"/>
 
             <xsl:apply-templates select="." mode="bs2:ActionBar">
                 <xsl:with-param name="active-mode" select="$mode"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
index 31aa939fe..1383cd0e6 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
@@ -161,7 +161,8 @@ exclude-result-prefixes="#all"
     </xsl:function>
     
     <xsl:function name="ldh:query-params" as="map(xs:string, xs:string*)">
-        <xsl:sequence select="ldh:parse-query-params(substring-after(ldh:request-uri(), '?'))"/>
+        <!-- ac:document-uri strips the URL's #fragment so it doesn't get glued onto the last query value -->
+        <xsl:sequence select="ldh:parse-query-params(substring-after(ac:document-uri(ldh:request-uri()), '?'))"/>
     </xsl:function>
     
     <xsl:function name="ldh:base-uri" as="xs:anyURI" use-when="system-property('xsl:product-name') = 'SAXON'">
@@ -329,7 +330,7 @@ exclude-result-prefixes="#all"
 
     <xsl:function name="ldh:parse-query-params" as="map(xs:string, xs:string*)">
         <xsl:param name="query-string" as="xs:string"/>
-        
+
         <xsl:sequence select="map:merge(
             tokenize($query-string, '&amp;')[normalize-space()]
             !
@@ -534,8 +535,8 @@ exclude-result-prefixes="#all"
     <!-- subject resource -->
     <xsl:template match="@rdf:about" mode="xhtml:Anchor">
 <!--        <xsl:param name="graph" as="xs:anyURI?" tunnel="yes"/>-->
-        <xsl:param name="fragment" select="if (starts-with(., ldt:base())) then (if (contains(., '#')) then substring-after(., '#') else ()) else encode-for-uri(.)" as="xs:string?"/>
-        <xsl:param name="href" select="ldh:href(xs:anyURI(.), map{}, $fragment)" as="xs:anyURI"/>
+        <xsl:param name="fragment" select="ac:fragment-id(.)" as="xs:string?"/>
+        <xsl:param name="href" select="ldh:href(ac:document-uri(xs:anyURI(.)), map{}, $fragment)" as="xs:anyURI"/>
         <xsl:param name="id" as="xs:string?"/>
         <xsl:param name="title" select="." as="xs:string?"/>
         <xsl:param name="class" as="xs:string?"/>
@@ -551,8 +552,8 @@ exclude-result-prefixes="#all"
     </xsl:template>
     
     <xsl:template match="@rdf:about | @rdf:resource" mode="svg:Anchor">
-        <xsl:param name="fragment" select="if (starts-with(., ldt:base())) then (if (contains(., '#')) then substring-after(., '#') else ()) else encode-for-uri(.)" as="xs:string?"/>
-        <xsl:param name="href" select="ldh:href(xs:anyURI(.), map{}, $fragment)" as="xs:anyURI"/>
+        <xsl:param name="fragment" select="ac:fragment-id(.)" as="xs:string?"/>
+        <xsl:param name="href" select="ldh:href(ac:document-uri(xs:anyURI(.)), map{}, $fragment)" as="xs:anyURI"/>
         <xsl:param name="id" select="$fragment" as="xs:string?"/>
         <xsl:param name="label" select="if (parent::rdf:Description) then ac:svg-label(..) else ac:svg-object-label(.)" as="xs:string"/>
         <xsl:param name="title" select="$label" as="xs:string"/>
@@ -573,8 +574,8 @@ exclude-result-prefixes="#all"
 
     <!-- proxy link URIs if they are external -->
     <xsl:template match="@rdf:resource | srx:uri" priority="2">
-        <xsl:param name="fragment" select="if (starts-with(., ldt:base())) then (if (contains(., '#')) then substring-after(., '#') else ()) else encode-for-uri(.)" as="xs:string?"/>
-        <xsl:param name="href" select="ldh:href(xs:anyURI(.), map{}, $fragment)" as="xs:anyURI"/>
+        <xsl:param name="fragment" select="ac:fragment-id(.)" as="xs:string?"/>
+        <xsl:param name="href" select="ldh:href(ac:document-uri(xs:anyURI(.)), map{}, $fragment)" as="xs:anyURI"/>
         <xsl:param name="id" as="xs:string?"/>
         <xsl:param name="title" select="." 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 c8ee105b6..03ac57302 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
@@ -758,6 +758,7 @@ exclude-result-prefixes="#all">
                             <xsl:with-param name="mode" select="ac:mode(root())"/>
                             <xsl:with-param name="base" select="ldt:base()"/>
                             <xsl:with-param name="endpoint" select="sd:endpoint()"/>
+                            <xsl:with-param name="about" select="ac:absolute-path(ldh:base-uri(.))"/>
                             <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
                         </xsl:apply-templates>
                     </div>
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 528df5d30..6bb17506e 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -122,7 +122,7 @@ extension-element-prefixes="ixsl"
     <xsl:param name="foaf:Agent" select="if ($acl:agent) then document(ac:document-uri($acl:agent)) else ()" as="document-node()?"/> <!-- should be in SaxonJS documentPool -->
     <xsl:param name="ac:lang" select="tokenize(ixsl:get(ixsl:get(ixsl:window(), 'navigator'), 'language'), '-')[1]" as="xs:string"/>
     <xsl:param name="ac:forClass" as="xs:anyURI?"/> <!-- used by Web-Client -->
-    <xsl:param name="ac:query" select="ixsl:query-params()?query" as="xs:string?"/>
+    <xsl:param name="ac:query" select="ldh:query-params()?query" as="xs:string?"/>
     <xsl:param name="ac:googleMapsKey" select="''" as="xs:string"/>  <!-- cannot remove yet as it's used by container.xsl in Web-Client -->
     <xsl:param name="sparql-parser" select="ixsl:call(ixsl:window(), 'Reflect.construct', [ ixsl:get(ixsl:get(ixsl:window(), '`' || 'SPARQL.js' || '`'), 'Parser'), [] ] )"/>
     <xsl:param name="sparql-generator" select="ixsl:call(ixsl:window(), 'Reflect.construct', [ ixsl:get(ixsl:get(ixsl:window(), '`' || 'SPARQL.js' || '`'), 'Generator'), [] ] )"/>
@@ -283,8 +283,11 @@ WHERE
                     </xsl:for-each>
                 </xsl:if>
 
+                <!-- doc URI: proxied target if ?uri= set, else local request URI; both via ac:absolute-path to drop ?query and #fragment.
+                     fragment: always from the OUTER URL (ldh:request-uri()) per RFC 3986 — LDH-built URLs put the fragment outside ?uri= -->
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="ldh:base-uri(ixsl:page())"/>
+                    <xsl:with-param name="doc-uri" select="if (ac:uri()) then ac:absolute-path(ac:uri()) else ac:absolute-path(ldh:request-uri())"/>
+                    <xsl:with-param name="fragment" select="ac:fragment-id(ldh:request-uri())"/>
                     <xsl:with-param name="push-state" select="false()"/>
                 </xsl:call-template>
             </xsl:otherwise>
@@ -435,7 +438,8 @@ WHERE
     <xsl:function name="ldh:rdf-document-response" ixsl:updating="yes">
         <xsl:param name="context" as="map(*)"/>
         <xsl:variable name="response" select="$context('response')" as="map(*)"/>
-        <xsl:variable name="uri" select="$context('uri')" as="xs:anyURI"/>
+        <xsl:variable name="doc-uri" select="$context('doc-uri')" as="xs:anyURI"/>
+        <xsl:variable name="fragment" select="$context('fragment')" as="xs:string?"/>
         <xsl:variable name="refresh-content" select="$context('refresh-content')" as="xs:boolean?"/>
 
         <xsl:for-each select="$response">
@@ -475,37 +479,39 @@ WHERE
                     <xsl:variable name="application" select="if ($application-link) then xs:anyURI(substring-before(substring-after(substring-before($application-link, ';'), '&lt;'), '&gt;')) else ()" as="xs:anyURI?"/>
                     <xsl:for-each select="?body">
                         <xsl:variable name="results" select="." as="document-node()"/>
-                        <ixsl:set-property name="{'`' || $uri || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
-                        <!-- store document under window.LinkedDataHub.contents[$uri].results -->
+                        <ixsl:set-property name="{'`' || $doc-uri || '`'}" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
+                        <!-- store document under window.LinkedDataHub.contents[$doc-uri].results -->
                         <!-- should be possible to cache the document using SaxonJS when this issue is resolved: https://saxonica.plan.io/issues/6355 -->
-                        <ixsl:set-property name="results" select="." object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`')"/>
-                        <!-- store ETag header value under window.LinkedDataHub.contents[$uri].etag -->
-                        <ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`')"/>
+                        <ixsl:set-property name="results" select="." object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`')"/>
+                        <!-- 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:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $uri]" as="element()?"/>
+                        <xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $doc-uri]" as="element()?"/>
                         <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
                         <xsl:variable name="tab-body-id" select="'tab-pane-' || ac:uuid()" as="xs:string"/>
-                        <xsl:variable name="tab-base" select="if ($application) then resolve-uri('/', lapp:origin($uri)) else ()" as="xs:anyURI?"/>
+                        <xsl:variable name="tab-base" select="if ($application) then resolve-uri('/', lapp:origin($doc-uri)) else ()" as="xs:anyURI?"/>
 
-                        <!-- set document title from RDF -->
-                        <xsl:variable name="label" select="if (exists(key('resources', $uri, $results))) then ac:label(key('resources', $uri, $results)) else string($uri)" as="xs:string"/>
+                        <!-- set document title from RDF; look up by the resource URI (with fragment) since SKOS Concepts etc. live at doc/#frag -->
+                        <xsl:variable name="resource-uri" select="xs:anyURI($doc-uri || (if ($fragment) then '#' || $fragment else ''))" as="xs:anyURI"/>
+                        <xsl:variable name="label" select="if (exists(key('resources', $resource-uri, $results))) then ac:label(key('resources', $resource-uri, $results)) else string($resource-uri)" as="xs:string"/>
                         <ixsl:set-property name="title" select="$label" object="ixsl:page()"/>
 
                         <!-- align URL with the mode detected from the RDF document -->
                         <xsl:call-template name="ldh:PushState">
-                            <xsl:with-param name="href" select="ldh:href($uri, ldh:build-query($mode))"/>
+                            <xsl:with-param name="href" select="ldh:href($doc-uri, ldh:build-query($mode), $fragment)"/>
                             <xsl:with-param name="title" select="$label"/>
                             <xsl:with-param name="container" select="id($body-id, ixsl:page())"/>
                         </xsl:call-template>
 
                         <!-- reuse exact-match pane, or same-origin pane (avoids accumulating panes for the same dataspace) -->
-                        <xsl:variable name="reuse-pane" select="($tab-pane, id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')][starts-with(@about, lapp:origin($uri))]])[1]" as="element()?"/>
+                        <xsl:variable name="reuse-pane" select="($tab-pane, id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')][starts-with(@about, lapp:origin($doc-uri))]])[1]" as="element()?"/>
                         <xsl:variable name="effective-pane-id" select="if ($reuse-pane) then $reuse-pane/@id else $tab-body-id" as="xs:string"/>
 
                         <!-- external-only, new pane only: add tab bar item and hide local pane -->
-                        <xsl:if test="not(starts-with($uri, lapp:origin(ldh:request-uri()))) and not($reuse-pane)">
+                        <xsl:if test="not(starts-with($doc-uri, lapp:origin(ldh:request-uri()))) and not($reuse-pane)">
                             <xsl:call-template name="ldh:AddTabNavBarListItem">
-                                <xsl:with-param name="uri" select="$uri"/>
+                                <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                                <xsl:with-param name="fragment" select="$fragment"/>
                                 <xsl:with-param name="label" select="$label"/>
                                 <xsl:with-param name="mode" select="$mode"/>
                             </xsl:call-template>
@@ -524,22 +530,20 @@ WHERE
                                     <xsl:result-document href="?." method="ixsl:replace-element">
                                         <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:DocumentBody">
                                             <xsl:with-param name="mode" select="$mode"/>
+                                            <xsl:with-param name="about" select="$doc-uri"/>
                                             <xsl:with-param name="object-metadata" select="$context('object-metadata')" tunnel="yes"/>
                                             <xsl:with-param name="property-metadata" select="$context('property-metadata')" tunnel="yes"/>
                                         </xsl:apply-templates>
                                     </xsl:result-document>
-
-                                    <!-- update @about to new URI -->
-                                    <ixsl:set-attribute name="about" select="$uri" object="."/>
                                 </xsl:for-each>
 
-                                <!-- sync the corresponding tab <li> to the new URI: data-uri keys downstream tab-activation and href-sync lookups -->
-                                <xsl:if test="string($uri) ne $old-about">
+                                <!-- sync the corresponding tab <li> to the new doc URI; data-uri keys downstream lookups -->
+                                <xsl:if test="string($doc-uri) ne $old-about">
                                     <xsl:for-each select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = $old-about]">
-                                        <ixsl:set-attribute name="data-uri" select="string($uri)" object="."/>
+                                        <ixsl:set-attribute name="data-uri" select="string($doc-uri)" object="."/>
                                         <xsl:for-each select="a">
-                                            <ixsl:set-attribute name="href" select="string(ldh:href($uri, ldh:build-query($mode)))" object="."/>
-                                            <ixsl:set-attribute name="title" select="string($uri)" object="."/>
+                                            <ixsl:set-attribute name="href" select="string(ldh:href($doc-uri, ldh:build-query($mode), $fragment))" object="."/>
+                                            <ixsl:set-attribute name="title" select="string($resource-uri)" object="."/>
                                             <xsl:result-document href="?." method="ixsl:replace-content">
                                                 <xsl:value-of select="$label"/>
                                             </xsl:result-document>
@@ -556,6 +560,7 @@ WHERE
                                         <xsl:with-param name="base" select="$tab-base"/>
                                         <xsl:with-param name="endpoint" select="$endpoint"/>
                                         <xsl:with-param name="application" select="$application"/>
+                                        <xsl:with-param name="about" select="$doc-uri"/>
                                         <xsl:with-param name="object-metadata" select="$context('object-metadata')" tunnel="yes"/>
                                         <xsl:with-param name="property-metadata" select="$context('property-metadata')" tunnel="yes"/>
                                     </xsl:apply-templates>
@@ -580,7 +585,8 @@ WHERE
 
                         <xsl:call-template name="ldh:RenderTab">
                             <xsl:with-param name="tab-pane-id" select="$effective-pane-id"/>
-                            <xsl:with-param name="uri" select="$uri"/>
+                            <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                            <xsl:with-param name="fragment" select="$fragment"/>
                             <xsl:with-param name="mode" select="$mode"/>
                             <xsl:with-param name="response" select="$response"/>
                             <xsl:with-param name="refresh-content" select="$refresh-content"/>
@@ -588,13 +594,12 @@ WHERE
 
                         <!-- initialize maps -->
                         <xsl:if test="key('elements-by-class', 'map-canvas', ixsl:page())">
-                            <xsl:variable name="block-uri" select="$uri" as="xs:anyURI"/>
                             <xsl:variable name="canvas-id" select="key('elements-by-class', 'map-canvas', ixsl:page())/@id" as="xs:string"/>
-                            <xsl:variable name="initial-load" select="not(ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'map'))" as="xs:boolean"/>
-                            <xsl:variable name="map" select="if ($initial-load) then ldh:create-map($canvas-id, 0, 0, 4) else ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'map')" as="item()"/>
+                            <xsl:variable name="initial-load" select="not(ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`'), 'map'))" as="xs:boolean"/>
+                            <xsl:variable name="map" select="if ($initial-load) then ldh:create-map($canvas-id, 0, 0, 4) else ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`'), 'map')" as="item()"/>
 
                             <xsl:if test="$initial-load">
-                                <ixsl:set-property name="map" select="$map" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')"/>
+                                <ixsl:set-property name="map" select="$map" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`')"/>
                             </xsl:if>
 
                             <xsl:call-template name="ldh:DrawMap">
@@ -640,16 +645,16 @@ WHERE
                     <xsl:if test="?media-type = 'application/rdf+xml'">
                         <xsl:for-each select="?body">
                             <xsl:variable name="results" select="." as="document-node()"/>
-                            <xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $uri]" as="element()?"/>
+                            <xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $doc-uri]" as="element()?"/>
                             <xsl:choose>
                                 <xsl:when test="$tab-pane">
                                     <xsl:for-each select="$tab-pane/div[contains-token(@class, 'document-body')]">
                                         <xsl:result-document href="?." method="ixsl:replace-element">
                                             <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:DocumentBody">
                                                 <xsl:with-param name="mode" select="xs:anyURI('&ac;ReadMode')"/>
+                                                <xsl:with-param name="about" select="$doc-uri"/>
                                             </xsl:apply-templates>
                                         </xsl:result-document>
-                                        <ixsl:set-attribute name="about" select="$uri" object="."/>
                                     </xsl:for-each>
                                 </xsl:when>
                                 <xsl:otherwise>
@@ -658,6 +663,7 @@ WHERE
                                         <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:TabBody">
                                             <xsl:with-param name="id" select="$tab-body-id"/>
                                             <xsl:with-param name="mode" select="xs:anyURI('&ac;ReadMode')"/>
+                                            <xsl:with-param name="about" select="$doc-uri"/>
                                         </xsl:apply-templates>
                                     </xsl:variable>
                                     <xsl:result-document href="#tab-content" method="ixsl:append-content">
@@ -676,14 +682,15 @@ WHERE
 
     <!-- Create a new tab for an external URI and render its content into #external-pane -->
     <xsl:template name="ldh:AddTabNavBarListItem">
-        <xsl:param name="uri" as="xs:anyURI"/>
+        <xsl:param name="doc-uri" as="xs:anyURI"/>
+        <xsl:param name="fragment" as="xs:string?"/>
         <xsl:param name="label" as="xs:string"/>
         <xsl:param name="mode" as="xs:anyURI"/>
 
-        <!-- append the new tab <li> to the tab bar -->
+        <!-- append the new tab <li> to the tab bar; data-uri keys lookups (document scope), @href round-trips the fragment for the user -->
         <xsl:result-document href="#tab-bar-list" method="ixsl:append-content">
-            <li data-uri="{$uri}">
-                <a href="{ldh:href($uri, ldh:build-query($mode))}" title="{$uri}">
+            <li data-uri="{$doc-uri}">
+                <a href="{ldh:href($doc-uri, ldh:build-query($mode), $fragment)}" title="{$doc-uri}{if ($fragment) then '#' || $fragment else ''}">
                     <xsl:value-of select="$label"/>
                 </a>
                 <span class="tab-close">&#xd7;</span>
@@ -695,9 +702,9 @@ WHERE
         <xsl:sequence select="ixsl:call(ixsl:get(ixsl:page(), 'documentElement.style'), 'setProperty', ['--action-bar-top', '98px'])[current-date() lt xs:date('2000-01-01')]"/>
     </xsl:template>
 
-    <!-- activate an existing tab -->
+    <!-- activate an existing tab; matches pane by @about = $doc-uri (document scope, no fragment) -->
     <xsl:template match="ul[@id = 'tab-bar-list']/li" mode="ldh:ActivateTab">
-        <xsl:param name="uri" select="xs:anyURI(ixsl:get(., 'dataset.uri'))" as="xs:anyURI"/>
+        <xsl:param name="doc-uri" select="xs:anyURI(ixsl:get(., 'dataset.uri'))" as="xs:anyURI"/>
 
         <!-- deactivate all tab <li>s -->
         <xsl:for-each select="id('tab-bar-list', ixsl:page())/li">
@@ -710,24 +717,24 @@ WHERE
         <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')]">
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'remove', [ 'active' ])[current-date() lt xs:date('2000-01-01')]"/>
             <ixsl:set-style name="display" select="'none'" object="."/>
-        </xsl:for-each>        
+        </xsl:for-each>
         <!-- activate and show tab pane -->
-        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $uri]">
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $doc-uri]">
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'add', [ 'active' ])[current-date() lt xs:date('2000-01-01')]"/>
             <ixsl:set-style name="display" select="'block'" object="."/>
         </xsl:for-each>
     </xsl:template>
 
-    <!-- render RDF results into a tab pane identified by @about = $uri -->
+    <!-- render RDF results into a tab pane identified by @about = $doc-uri -->
     <!-- works for both local (#content-body) and external panes -->
     <xsl:template name="ldh:RenderTab">
         <xsl:param name="tab-pane-id" as="xs:string"/>
-        <xsl:param name="uri" as="xs:anyURI"/>
-        <xsl:param name="tab-list-item" select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = $uri]" as="element()?"/>
+        <xsl:param name="doc-uri" as="xs:anyURI"/>
+        <xsl:param name="fragment" as="xs:string?"/>
+        <xsl:param name="tab-list-item" select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = $doc-uri]" as="element()?"/>
         <xsl:param name="mode" as="xs:anyURI"/>
         <xsl:param name="response" as="map(*)"/>
         <xsl:param name="refresh-content" select="()" as="xs:boolean?"/>
-        <xsl:variable name="rdf" select="$response?body" as="document-node()"/>
 
         <!-- activate tab list item, or show pane directly for local docs (no tab bar item) -->
         <xsl:choose>
@@ -748,7 +755,7 @@ WHERE
 
         <!-- update sidebar against the now-active pane (sd:endpoint() reads its data-endpoint) -->
         <xsl:call-template name="ldh:NavigationUpdate">
-            <xsl:with-param name="href" select="ldh:href($uri, ldh:build-query($mode))"/>
+            <xsl:with-param name="href" select="ldh:href($doc-uri, ldh:build-query($mode), $fragment)"/>
         </xsl:call-template>
 
         <!-- fire factories for top-level content blocks in the rendered pane -->
@@ -763,19 +770,29 @@ WHERE
                 <ixsl:promise select="$factory(())" on-failure="ldh:promise-failure#1"/>
             </xsl:for-each>
         </xsl:for-each>
-            
+
         <!-- bs2:ActionBar always renders breadcrumb-nav inside bs2:ActionBarMain -->
         <xsl:variable name="pane-breadcrumb-nav" select="id($tab-pane-id, ixsl:page())//*[contains-token(@class, 'breadcrumb-nav')]" as="element()?"/>
         <xsl:if test="$pane-breadcrumb-nav">
             <xsl:call-template name="ldh:PopulateBreadcrumbNav">
                 <xsl:with-param name="container" select="$pane-breadcrumb-nav"/>
                 <xsl:with-param name="response" select="$response"/>
-                <xsl:with-param name="uri" select="xs:anyURI(ac:absolute-path($uri))"/>
+                <xsl:with-param name="uri" select="$doc-uri"/>
             </xsl:call-template>
         </xsl:if>
 
-        <!-- scroll to top of the window -->
-        <xsl:sequence select="ixsl:call(ixsl:window(), 'scrollTo', [ 0, 0 ])[current-date() lt xs:date('2000-01-01')]"/>
+        <!-- scroll to the fragment-targeted element if present, otherwise to top -->
+        <!-- look up the rendered RDFa resource container in the active pane via @about; sidesteps the multi-pane @id uniqueness constraint (two panes may both render a resource at the same fragment) -->
+        <xsl:variable name="resource-uri" select="xs:anyURI($doc-uri || (if ($fragment) then '#' || $fragment else ''))" as="xs:anyURI"/>
+        <xsl:variable name="scroll-target" as="element()?" select="if ($fragment) then (id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]//*[@about = $resource-uri])[1] else ()"/>
+        <xsl:choose>
+            <xsl:when test="exists($scroll-target)">
+                <xsl:sequence select="ixsl:call($scroll-target, 'scrollIntoView', [])[current-date() lt xs:date('2000-01-01')]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="ixsl:call(ixsl:window(), 'scrollTo', [ 0, 0 ])[current-date() lt xs:date('2000-01-01')]"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <!-- push state -->
@@ -799,10 +816,11 @@ WHERE
         <xsl:sequence select="ixsl:call(ixsl:window(), 'history.pushState', [ $state-obj, $title, $href ])[current-date() lt xs:date('2000-01-01')]"/>
     </xsl:template>
     
-    <!-- switch to a tab whose pane DOM and LinkedDataHub.contents[$uri] are already populated: no fetch, no re-render -->
+    <!-- switch to a tab whose pane DOM and LinkedDataHub.contents[$doc-uri] are already populated: no fetch, no re-render -->
     <xsl:template name="ldh:TabSwitch">
-        <xsl:param name="uri" as="xs:anyURI"/>
-        <xsl:param name="href" as="xs:anyURI"/>
+        <xsl:param name="doc-uri" as="xs:anyURI"/>
+        <xsl:param name="fragment" as="xs:string?"/>
+        <xsl:param name="query-params" select="map{}" as="map(xs:string, xs:string*)"/>
         <xsl:param name="tab-li" as="element()"/>
         <xsl:param name="push-state" select="true()" as="xs:boolean"/>
         <xsl:param name="container" as="element()" select="id($body-id, ixsl:page())"/>
@@ -813,11 +831,13 @@ WHERE
         </xsl:if>
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
 
-        <!-- mirror ldh:DocumentNavigate: show external URI, clear for local -->
+        <xsl:variable name="href" select="ldh:href($doc-uri, $query-params, $fragment)" as="xs:anyURI"/>
+
+        <!-- address bar shows the resource URI (with fragment) for external, blank for local -->
         <xsl:for-each select="id('uri', ixsl:page())">
             <xsl:choose>
-                <xsl:when test="not(starts-with($uri, lapp:origin(ldh:request-uri()) || '/'))">
-                    <ixsl:set-property name="value" select="string($uri)" object="."/>
+                <xsl:when test="not(starts-with($doc-uri, lapp:origin(ldh:request-uri()) || '/'))">
+                    <ixsl:set-property name="value" select="$doc-uri || (if ($fragment) then '#' || $fragment else '')" object="."/>
                 </xsl:when>
                 <xsl:otherwise>
                     <ixsl:set-property name="value" select="''" object="."/>
@@ -833,19 +853,33 @@ WHERE
             </xsl:call-template>
         </xsl:if>
 
-        <xsl:apply-templates select="$tab-li" mode="ldh:ActivateTab"/>
+        <xsl:apply-templates select="$tab-li" mode="ldh:ActivateTab">
+            <xsl:with-param name="doc-uri" select="$doc-uri"/>
+        </xsl:apply-templates>
 
         <xsl:call-template name="ldh:NavigationUpdate">
             <xsl:with-param name="href" select="$href"/>
         </xsl:call-template>
 
-        <xsl:sequence select="ixsl:call(ixsl:window(), 'scrollTo', [ 0, 0 ])[current-date() lt xs:date('2000-01-01')]"/>
+        <!-- scroll to the fragment-targeted element if present, otherwise to top -->
+        <!-- look up the rendered RDFa resource container in the active pane via @about; sidesteps the multi-pane @id uniqueness constraint (two panes may both render a resource at the same fragment) -->
+        <xsl:variable name="resource-uri" select="xs:anyURI($doc-uri || (if ($fragment) then '#' || $fragment else ''))" as="xs:anyURI"/>
+        <xsl:variable name="scroll-target" as="element()?" select="if ($fragment) then (id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]//*[@about = $resource-uri])[1] else ()"/>
+        <xsl:choose>
+            <xsl:when test="exists($scroll-target)">
+                <xsl:sequence select="ixsl:call($scroll-target, 'scrollIntoView', [])[current-date() lt xs:date('2000-01-01')]"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="ixsl:call(ixsl:window(), 'scrollTo', [ 0, 0 ])[current-date() lt xs:date('2000-01-01')]"/>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <!-- document navigation: handles local/external branching -->
 
     <xsl:template name="ldh:DocumentNavigate">
-        <xsl:param name="uri" as="xs:anyURI"/>
+        <xsl:param name="doc-uri" as="xs:anyURI"/>
+        <xsl:param name="fragment" as="xs:string?"/>
         <xsl:param name="query-params" select="map{}" as="map(xs:string, xs:string*)"/>
         <xsl:param name="push-state" select="true()" as="xs:boolean"/>
         <xsl:param name="container" as="element()" select="id($body-id, ixsl:page())"/>
@@ -858,14 +892,14 @@ WHERE
         <xsl:variable name="controller" select="ixsl:abort-controller()"/>
         <ixsl:set-property name="saxonController" select="$controller" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
 
-        <xsl:variable name="href" select="ldh:href($uri, $query-params)" as="xs:anyURI"/>
+        <xsl:variable name="href" select="ldh:href($doc-uri, $query-params, $fragment)" as="xs:anyURI"/>
 
-        <!-- update address bar input: show external URI, clear for local docs -->
+        <!-- update address bar input: show resource URI (with fragment) for external, clear for local docs -->
         <!-- use browser origin (not ldt:base()) so the check is correct even when an external tab is active: ldt:base() reads the active pane's data-base, which would mis-classify same-origin proxy URIs as "local" and cross-dataspace URIs as "external" mid-switch -->
         <xsl:for-each select="id('uri', ixsl:page())">
             <xsl:choose>
-                <xsl:when test="not(starts-with($uri, lapp:origin(ldh:request-uri()) || '/'))">
-                    <ixsl:set-property name="value" select="string($uri)" object="."/>
+                <xsl:when test="not(starts-with($doc-uri, lapp:origin(ldh:request-uri()) || '/'))">
+                    <ixsl:set-property name="value" select="$doc-uri || (if ($fragment) then '#' || $fragment else '')" object="."/>
                 </xsl:when>
                 <xsl:otherwise>
                     <ixsl:set-property name="value" select="''" object="."/>
@@ -874,7 +908,7 @@ WHERE
         </xsl:for-each>
 
         <!-- hide local tab pane for external URIs -->
-        <xsl:if test="not(starts-with($uri, lapp:origin(ldh:request-uri()) || '/'))">
+        <xsl:if test="not(starts-with($doc-uri, lapp:origin(ldh:request-uri()) || '/'))">
             <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = ac:absolute-path(ldh:request-uri())]">
                 <ixsl:set-style name="display" select="'none'" object="."/>
             </xsl:for-each>
@@ -887,15 +921,15 @@ WHERE
                 <xsl:with-param name="container" select="$container"/>
             </xsl:call-template>
 
-            <!-- keep the matching tab's @href in lockstep with the address bar -->
-            <!-- $uri may carry a query string (e.g. /employees/8/?mode=X) when handlers fall back to $uri = $href for local URLs; data-uri is bare, so strip query before comparing -->
-            <xsl:for-each select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = string(ac:absolute-path($uri))]/a">
+            <!-- keep the matching tab's @href in lockstep with the address bar; data-uri is the document URI -->
+            <xsl:for-each select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = string($doc-uri)]/a">
                 <ixsl:set-attribute name="href" select="string($href)" object="."/>
             </xsl:for-each>
         </xsl:if>
 
         <xsl:call-template name="ldh:RDFDocumentLoad">
-            <xsl:with-param name="uri" select="$uri"/>
+            <xsl:with-param name="doc-uri" select="$doc-uri"/>
+            <xsl:with-param name="fragment" select="$fragment"/>
             <xsl:with-param name="controller" select="$controller"/>
         </xsl:call-template>
     </xsl:template>
@@ -903,18 +937,19 @@ WHERE
     <!-- load RDF document -->
 
     <xsl:template name="ldh:RDFDocumentLoad">
-        <xsl:param name="uri" as="xs:anyURI"/>
+        <xsl:param name="doc-uri" as="xs:anyURI"/>
+        <xsl:param name="fragment" as="xs:string?"/>
         <xsl:param name="refresh-content" as="xs:boolean?"/>
         <xsl:param name="controller" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub'), 'saxonController')"/>
         <!-- if the URI is external, dereference it through the proxy -->
-        <!-- add a bogus query parameter to give the RDF/XML document a different URL in the browser cache, otherwise it will clash with the HTML representation -->
-        <!-- this is due to broken browser behavior re. Vary and conditional requests: https://stackoverflow.com/questions/60799116/firefox-if-none-match-headers-ignore-content-type-and-vary/60802443 -->
-        <xsl:variable name="request-uri" select="ldh:href(ac:document-uri($uri), map{}, ())" as="xs:anyURI"/>
+        <!-- HTTP requests carry no fragment (protocol-level) -->
+        <xsl:variable name="request-uri" select="ldh:href($doc-uri, map{}, ())" 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,
-            'uri': $uri,
+            'doc-uri': $doc-uri,
+            'fragment': $fragment,
             'refresh-content': $refresh-content,
             'endpoint': sd:endpoint()
           }"/>
@@ -942,23 +977,27 @@ WHERE
         <xsl:if test="not(empty($state))">
             <xsl:variable name="href" select="map:get($state, 'href')" as="xs:anyURI?"/>
 
-            <!-- decode URI from the ?uri query param if the URI was proxied; otherwise strip the query string so the cache key matches document-body/@about -->
-            <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after($href, '?'))" as="map(xs:string, xs:string*)"/>
-            <xsl:variable name="uri" select="if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else ac:absolute-path($href)" as="xs:anyURI"/>
-            <xsl:variable name="tab-li" select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = string($uri)]" as="element()?"/>
+            <!-- strip URL fragment before parsing query so it doesn't get glued onto the last query value -->
+            <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after(ac:document-uri($href), '?'))" as="map(xs:string, xs:string*)"/>
+            <xsl:variable name="doc-uri" select="ac:absolute-path(if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else $href)" as="xs:anyURI"/>
+            <!-- fragment lives on the OUTER URL per RFC 3986 -->
+            <xsl:variable name="fragment" select="ac:fragment-id($href)" as="xs:string?"/>
+            <xsl:variable name="tab-li" select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = string($doc-uri)]" as="element()?"/>
 
             <xsl:choose>
-                <xsl:when test="exists($tab-li) and ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`')">
+                <xsl:when test="exists($tab-li) and ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`') and deep-equal(map:remove($query-params, 'uri'), map:remove(ldh:query-params(), 'uri'))">
                     <xsl:call-template name="ldh:TabSwitch">
-                        <xsl:with-param name="uri" select="$uri"/>
-                        <xsl:with-param name="href" select="$href"/>
+                        <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                        <xsl:with-param name="fragment" select="$fragment"/>
+                        <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
                         <xsl:with-param name="tab-li" select="$tab-li"/>
                         <xsl:with-param name="push-state" select="false()"/>
                     </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:call-template name="ldh:DocumentNavigate">
-                        <xsl:with-param name="uri" select="$uri"/>
+                        <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                        <xsl:with-param name="fragment" select="$fragment"/>
                         <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
                         <xsl:with-param name="push-state" select="false()"/>
                     </xsl:call-template>
@@ -974,15 +1013,34 @@ WHERE
     <!-- resolve URLs against the current document URL because they can be relative -->
     <xsl:template match="a[not(@target)][starts-with(resolve-uri(@href, ldh:base-uri(.)), 'http://') or starts-with(resolve-uri(@href, ldh:base-uri(.)), 'https://')][not(starts-with(resolve-uri(@href, ldh:base-uri(.)), resolve-uri('uploads/', ldt:base())))][ancestor::div[contains-token(@class, 'breadcrumb-nav')] or not(ancestor::div[tokenize(@class, ' ') = ('navbar', 'footer')])] | a[contains-token(@class, 'brand')] | div[button[contains-token(@class, 'btn-apps')]]/ul//a | svg:a[not(@target)][starts-with(resolve-uri(@href, ldh:base-uri(.)), 'http://') or starts-with(resolve-uri(@href, ldh:base-uri(.)), 'https://')][not(starts-with(resolve-uri(@href, ldh:base-uri(.)), resolve-uri('uploads/', ldt:base())))]" mode="ixsl:onclick">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-        <xsl:variable name="href" select="xs:anyURI(ac:document-uri(resolve-uri(@href, ldh:base-uri(.))))" as="xs:anyURI"/>
-        <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after($href, '?'))" as="map(xs:string, xs:string*)"/>
-        <!-- proxied link: $uri is the external target (?uri=…); local link: $uri is the bare document URI without query so the cache key matches document-body/@about -->
-        <xsl:variable name="uri" select="if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else ac:absolute-path($href)" as="xs:anyURI"/>
-
-        <xsl:call-template name="ldh:DocumentNavigate">
-            <xsl:with-param name="uri" select="$uri"/>
-            <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
-        </xsl:call-template>
+        <!-- resolve link href against base; ac:document-uri strips the URL's fragment so it doesn't corrupt query parsing -->
+        <xsl:variable name="href" select="xs:anyURI(resolve-uri(@href, ldh:base-uri(.)))" as="xs:anyURI"/>
+        <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after(ac:document-uri($href), '?'))" as="map(xs:string, xs:string*)"/>
+        <!-- proxied link: doc URI is the ?uri= value; local link: doc URI is $href without query/fragment -->
+        <xsl:variable name="doc-uri" select="ac:absolute-path(if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else $href)" as="xs:anyURI"/>
+        <!-- fragment lives on the OUTER URL per RFC 3986 / ldh:href convention -->
+        <xsl:variable name="fragment" select="ac:fragment-id($href)" as="xs:string?"/>
+
+        <xsl:variable name="tab-li" select="id('tab-bar-list', ixsl:page())/li[ixsl:get(., 'dataset.uri') = string($doc-uri)]" as="element()?"/>
+
+        <xsl:choose>
+            <!-- same-doc cached AND non-uri query params unchanged: switch (no fetch, no re-render), just scroll to the new fragment if any -->
+            <xsl:when test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`') and exists($tab-li) and deep-equal(map:remove($query-params, 'uri'), map:remove(ldh:query-params(), 'uri'))">
+                <xsl:call-template name="ldh:TabSwitch">
+                    <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                    <xsl:with-param name="fragment" select="$fragment"/>
+                    <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
+                    <xsl:with-param name="tab-li" select="$tab-li"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:call-template name="ldh:DocumentNavigate">
+                    <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                    <xsl:with-param name="fragment" select="$fragment"/>
+                    <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
+                </xsl:call-template>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
     <xsl:template match="form[contains-token(@class, 'navbar-form')]" mode="ixsl:onsubmit">
@@ -991,10 +1049,11 @@ WHERE
 
         <!-- ignore form submission if the input value is not a valid http(s):// URI -->
         <xsl:if test="$uri-string castable as xs:anyURI and (starts-with($uri-string, 'http://') or starts-with($uri-string, 'https://'))">
-            <xsl:variable name="uri" select="xs:anyURI($uri-string)" as="xs:anyURI"/>
+            <xsl:variable name="resource-uri" select="xs:anyURI($uri-string)" as="xs:anyURI"/>
 
             <xsl:call-template name="ldh:DocumentNavigate">
-                <xsl:with-param name="uri" select="$uri"/>
+                <xsl:with-param name="doc-uri" select="ac:absolute-path($resource-uri)"/>
+                <xsl:with-param name="fragment" select="ac:fragment-id($resource-uri)"/>
             </xsl:call-template>
         </xsl:if>
     </xsl:template>
@@ -1002,13 +1061,15 @@ WHERE
     <xsl:template name="onDelete">
         <xsl:context-item as="map(*)" use="required"/>
         <xsl:param name="doc-uri" as="xs:anyURI"/>
-        
+
         <xsl:choose>
             <xsl:when test="?status = 204"> <!-- No Content -->
-                <xsl:variable name="uri" select="resolve-uri('..', $doc-uri)" as="xs:anyURI"/>
+                <!-- parent directory; no fragment relevant here -->
+                <xsl:variable name="parent-doc-uri" select="resolve-uri('..', $doc-uri)" as="xs:anyURI"/>
 
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="$uri"/>
+                    <xsl:with-param name="doc-uri" select="$parent-doc-uri"/>
+                    <xsl:with-param name="fragment" select="()"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
@@ -1084,23 +1145,28 @@ WHERE
     <xsl:template match="ul[@id = 'tab-bar-list']/li[not(contains-token(@class, 'active'))]/a" mode="ixsl:onclick">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="href" select="xs:anyURI(resolve-uri(@href, ldh:base-uri(.)))" as="xs:anyURI"/>
-        <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after($href, '?'))" as="map(xs:string, xs:string*)"/>
-        <!-- proxied tab: $uri is the external target (?uri=…); local tab: $uri is the bare document URI (no query string) - matches data-uri / document-body/@about, so the cache key downstream stays consistent -->
-        <xsl:variable name="uri" select="if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else ac:absolute-path($href)" as="xs:anyURI"/>
+        <!-- ac:document-uri strips the URL's fragment so it doesn't get glued onto the last query value -->
+        <xsl:variable name="query-params" select="ldh:parse-query-params(substring-after(ac:document-uri($href), '?'))" as="map(xs:string, xs:string*)"/>
+        <!-- proxied tab: doc URI is the ?uri= value; local tab: doc URI is $href without query/fragment -->
+        <xsl:variable name="doc-uri" select="ac:absolute-path(if (map:contains($query-params, 'uri')) then xs:anyURI(map:get($query-params, 'uri')) else $href)" as="xs:anyURI"/>
+        <!-- fragment lives on the OUTER URL per RFC 3986 / ldh:href convention -->
+        <xsl:variable name="fragment" select="ac:fragment-id($href)" as="xs:string?"/>
 
         <xsl:choose>
-            <!-- pane already rendered for $uri and cache populated: pure CSS toggle, no fetch -->
-            <xsl:when test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`')">
+            <!-- cache populated AND non-uri query params unchanged: pure CSS toggle + scroll, no fetch, no re-render -->
+            <xsl:when test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $doc-uri || '`') and deep-equal(map:remove($query-params, 'uri'), map:remove(ldh:query-params(), 'uri'))">
                 <xsl:call-template name="ldh:TabSwitch">
-                    <xsl:with-param name="uri" select="$uri"/>
-                    <xsl:with-param name="href" select="$href"/>
+                    <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                    <xsl:with-param name="fragment" select="$fragment"/>
+                    <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
                     <xsl:with-param name="tab-li" select=".."/>
                     <xsl:with-param name="container" select=".."/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="$uri"/>
+                    <xsl:with-param name="doc-uri" select="$doc-uri"/>
+                    <xsl:with-param name="fragment" select="$fragment"/>
                     <xsl:with-param name="query-params" select="map:remove($query-params, 'uri')"/>
                     <xsl:with-param name="container" select=".."/>
                 </xsl:call-template>
@@ -1110,37 +1176,40 @@ WHERE
 
     <xsl:template match="ul[@id = 'tab-bar-list']/li/span[contains-token(@class, 'tab-close')]" mode="ixsl:onclick">
         <xsl:variable name="tab-li" select=".." as="element()"/>
-        <xsl:variable name="uri" select="xs:anyURI(ixsl:get($tab-li, 'dataset.uri'))" as="xs:anyURI"/>
+        <xsl:variable name="doc-uri" select="xs:anyURI(ixsl:get($tab-li, 'dataset.uri'))" as="xs:anyURI"/>
         <xsl:variable name="was-active" select="contains-token($tab-li/@class, 'active')" as="xs:boolean"/>
 
         <!-- pick fallback BEFORE removing this li; prefer previous sibling, fall back to next -->
         <xsl:variable name="fallback-li" select="($tab-li/preceding-sibling::li[1], $tab-li/following-sibling::li[1])[1]" as="element()?"/>
 
-        <!-- remove the associated tab pane (matched by document-body/@about = $uri) -->
-        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $uri]">
+        <!-- remove the associated tab pane (matched by document-body/@about = $doc-uri) -->
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'document-body')]/@about = $doc-uri]">
             <xsl:sequence select="ixsl:call(., 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
         </xsl:for-each>
 
         <!-- remove the tab <li> from the DOM -->
         <xsl:sequence select="ixsl:call($tab-li, 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
 
-        <!-- if the closed tab was active, switch to the fallback's URI (ldh:TabSwitch if cached, otherwise ldh:DocumentNavigate -> RenderTab will activate after fetch) -->
+        <!-- if the closed tab was active, switch to the fallback (TabSwitch if cached; otherwise DocumentNavigate → RenderTab will activate after fetch) -->
         <xsl:if test="$was-active and $fallback-li">
             <xsl:variable name="fallback-href" select="xs:anyURI(resolve-uri($fallback-li/a/@href, ldh:base-uri(.)))" as="xs:anyURI"/>
-            <xsl:variable name="fallback-query-params" select="ldh:parse-query-params(substring-after($fallback-href, '?'))" as="map(xs:string, xs:string*)"/>
-            <xsl:variable name="fallback-uri" select="if (map:contains($fallback-query-params, 'uri')) then xs:anyURI(map:get($fallback-query-params, 'uri')) else ac:absolute-path($fallback-href)" as="xs:anyURI"/>
+            <xsl:variable name="fallback-query-params" select="ldh:parse-query-params(substring-after(ac:document-uri($fallback-href), '?'))" as="map(xs:string, xs:string*)"/>
+            <xsl:variable name="fallback-doc-uri" select="ac:absolute-path(if (map:contains($fallback-query-params, 'uri')) then xs:anyURI(map:get($fallback-query-params, 'uri')) else $fallback-href)" as="xs:anyURI"/>
+            <xsl:variable name="fallback-fragment" select="ac:fragment-id($fallback-href)" as="xs:string?"/>
 
             <xsl:choose>
-                <xsl:when test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $fallback-uri || '`')">
+                <xsl:when test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $fallback-doc-uri || '`') and deep-equal(map:remove($fallback-query-params, 'uri'), map:remove(ldh:query-params(), 'uri'))">
                     <xsl:call-template name="ldh:TabSwitch">
-                        <xsl:with-param name="uri" select="$fallback-uri"/>
-                        <xsl:with-param name="href" select="$fallback-href"/>
+                        <xsl:with-param name="doc-uri" select="$fallback-doc-uri"/>
+                        <xsl:with-param name="fragment" select="$fallback-fragment"/>
+                        <xsl:with-param name="query-params" select="map:remove($fallback-query-params, 'uri')"/>
                         <xsl:with-param name="tab-li" select="$fallback-li"/>
                     </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                     <xsl:call-template name="ldh:DocumentNavigate">
-                        <xsl:with-param name="uri" select="$fallback-uri"/>
+                        <xsl:with-param name="doc-uri" select="$fallback-doc-uri"/>
+                        <xsl:with-param name="fragment" select="$fallback-fragment"/>
                         <xsl:with-param name="query-params" select="map:remove($fallback-query-params, 'uri')"/>
                     </xsl:call-template>
                 </xsl:otherwise>
@@ -1226,8 +1295,10 @@ WHERE
         
         <xsl:choose>
             <xsl:when test="$status = (200, 204)">
+                <!-- post-upload reload of the current document; ldh:base-uri already strips fragment -->
                 <xsl:call-template name="ldh:DocumentNavigate">
-                    <xsl:with-param name="uri" select="ldh:base-uri(.)"/>
+                    <xsl:with-param name="doc-uri" select="ldh:base-uri(.)"/>
+                    <xsl:with-param name="fragment" select="()"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>

From f0f309ab0da226baa8ccd9e02c2d1fff77783689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Tue, 19 May 2026 11:31:13 +0200
Subject: [PATCH 2/2] Scope modal forms to active tab pane and promise-ify
 their handlers

Modals (class-instances, geo, latest, search) and the Add Data / Save
As / Reconcile forms now mount inside the active pane's content-body
instead of document body, with pane-scoped @id and a data-container-id
hook so multiple tabs no longer collide on a single shared modal id.
Selectors targeting these modals move from fixed @id to CSS classes
(modal-class-instances, modal-geo, modal-latest, modal-search).

Converts the access / endpoint-classes / typeahead-resource handlers
from xsl:schedule-action named templates to ixsl:promise chains backed
by ldh:*-response functions, matching the rest of the client. The
typeahead-fetching half of ldh:ShowAddDataForm is extracted to a new
ldh:LoadTypeaheads helper so callers compose the two steps explicitly.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../bootstrap/2.3.2/client/constructor.xsl    |   2 +-
 .../xsl/bootstrap/2.3.2/client/modal.xsl      | 206 ++++++++++--------
 .../xsl/bootstrap/2.3.2/client/navigation.xsl |  44 ++--
 .../atomgraph/linkeddatahub/xsl/client.xsl    |  13 +-
 4 files changed, 160 insertions(+), 105 deletions(-)

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/constructor.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/constructor.xsl
index 59304d216..139da7f71 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/constructor.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/constructor.xsl
@@ -391,7 +391,7 @@ exclude-result-prefixes="#all"
     <xsl:template match="button[contains-token(@class, 'btn-edit-constructors')]" mode="ixsl:onclick">"
         <xsl:variable name="type" select="ixsl:get(., 'dataset.resourceType')" as="xs:anyURI"/>
 
-        <xsl:for-each select="ixsl:page()//body">
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]">
             <xsl:call-template name="ldh:LoadConstructors">
                 <xsl:with-param name="type" select="$type"/>
             </xsl:call-template>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
index dd0dd7e55..0feb67ef8 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl
@@ -144,7 +144,7 @@ LIMIT   10
                                 </xsl:value-of>
                             </label>
                             <div class="controls">
-                                <span>
+                                <span data-for-class="&dh;Container &dh;Item">
                                     <input type="text" name="ou" id="remote-rdf-doc" class="resource-typeahead typeahead"/>
                                     <ul class="resource-typeahead typeahead dropdown-menu" id="ul-upload-rdf-doc" style="display: none;"></ul>
                                 </span>
@@ -395,7 +395,7 @@ LIMIT   10
                     </fieldset>
 
                     <div id="request-access-matrix">
-                        <!-- content replaced by the onAccessResponseLoad callback -->
+                        <!-- content replaced by the ldh:access-response callback -->
                     </div>
                    
                     <div class="form-actions modal-footer">
@@ -978,7 +978,10 @@ LIMIT   10
     </xsl:template>
     
     <xsl:template match="button[contains-token(@class, 'btn-add-ontology')]" mode="ixsl:onclick">
-        <xsl:call-template name="ldh:ShowAddDataForm">
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="graph" select="ldh:base-uri(.)" as="xs:anyURI"/>
+
+        <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" as="element()">
                 <xsl:call-template name="ldh:AddDataForm">
                     <xsl:with-param name="action" select="ldh:href(resolve-uri('transform', ldt:base()), map{})"/>
@@ -986,14 +989,23 @@ LIMIT   10
                     <xsl:with-param name="legend-label" select="ac:label(key('resources', 'import-ontology', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))"/>
                 </xsl:call-template>
             </xsl:with-param>
+            <xsl:with-param name="target" select="$target"/>
+        </xsl:call-template>
+
+        <xsl:call-template name="ldh:LoadTypeaheads">
+            <xsl:with-param name="typeahead-spans" select="(id('upload-rdf-doc', ixsl:page())/.., id('remote-rdf-doc', ixsl:page())/..)"/>
+            <xsl:with-param name="graph" select="$graph"/>
         </xsl:call-template>
     </xsl:template>
 
     <xsl:template match="button[contains-token(@class, 'btn-generate-containers')]" mode="ixsl:onclick">
-        <xsl:call-template name="ldh:ShowAddDataForm">
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+
+        <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" as="element()">
                 <xsl:call-template name="ldh:GenerateContainersForm"/>
             </xsl:with-param>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
     </xsl:template>
 
@@ -1065,22 +1077,28 @@ LIMIT   10
         <!-- TO-DO: fix for admin apps -->
         <xsl:param name="this" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
         <xsl:variable name="request-uri" select="ldh:href(ac:build-uri(resolve-uri('access', lapp:origin($this)), map{ 'this': $this }))" as="xs:anyURI"/>
-        <xsl:variable name="request" as="item()*">
-            <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
-                <xsl:call-template name="onAccessResponseLoad">
-                    <xsl:with-param name="agent" select="$acl:agent"/>
-                    <xsl:with-param name="this" select="$this"/>
-                </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,
+            'agent': $acl:agent,
+            'this': $this
+          }"/>
+
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))
+            => ixsl:then(ldh:rethread-response($context, ?))
+            => ixsl:then(ldh:handle-response#1)
+            => ixsl:then(ldh:access-response#1)
+        " on-failure="ldh:promise-failure#1"/>
     </xsl:template>
     
     <xsl:template match="button[contains-token(@class, 'btn-reconcile')]" mode="ixsl:onclick">
         <xsl:variable name="resource" select="input[@name = 'resource']/@value" as="xs:anyURI"/>
         <xsl:variable name="label" select="input[@name = 'label']/@value" as="xs:string"/>
         <xsl:variable name="service" select="input[@name = 'service']/@value" as="xs:anyURI"/>
-        
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+
         <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" as="element()">
                 <xsl:call-template name="ldh:ReconcileForm">
@@ -1089,6 +1107,7 @@ LIMIT   10
                     <xsl:with-param name="service" select="$service"/>
                 </xsl:call-template>
             </xsl:with-param>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
     </xsl:template>
     
@@ -1198,15 +1217,19 @@ LIMIT   10
         </xsl:variable>    
         <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($results-uri)" as="xs:anyURI"/>
+        <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': $fieldset
+          }"/>
 
-        <xsl:variable name="request" as="item()*">
-            <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/sparql-results+xml' } }" wait="$timeout">
-                <xsl:call-template name="onEndpointClassesLoad">
-                    <xsl:with-param name="container" select="$fieldset"/>
-                </xsl:call-template>
-            </ixsl:schedule-action>
-        </xsl:variable>
-        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+        <ixsl:promise select="
+          ixsl:http-request($context('request'))
+            => ixsl:then(ldh:rethread-response($context, ?))
+            => ixsl:then(ldh:handle-response#1)
+            => ixsl:then(ldh:endpoint-classes-response#1)
+        " on-failure="ldh:promise-failure#1"/>
     </xsl:template>
 
     <!-- validate form before submitting it and show errors on required control-groups where input values are missing -->
@@ -1288,65 +1311,60 @@ LIMIT   10
         </xsl:choose>
     </xsl:function>
     
-    <!-- show "Add data"/"Save as" form -->
 
-    <xsl:template name="ldh:ShowAddDataForm">
+    <!-- show modal form -->
+
+    <xsl:template name="ldh:ShowModalForm">
         <xsl:param name="form" as="element()"/>
-        <xsl:param name="graph" select="ldh:base-uri(.)" as="xs:anyURI?"/>
+        <xsl:param name="target" as="element()"/>
 
-        <!-- don't append the div if it's already there -->
+        <!-- per-pane modal ids guarantee uniqueness, so the page-wide existence check suffices -->
         <xsl:if test="not(id($form/@id, ixsl:page()))">
-            <xsl:for-each select="ixsl:page()//body">
-                <!-- append modal div to body -->
+            <xsl:for-each select="$target">
                 <xsl:result-document href="?." method="ixsl:append-content">
                     <xsl:sequence select="$form"/>
                 </xsl:result-document>
 
-                <xsl:if test="$graph">
-                    <xsl:variable name="request-uri" select="ldh:href($graph, map{})" as="xs:anyURI"/>
-                    <!-- fill the container typeahead values for both #upload-rdf-doc and #remote-rdf-doc -->
-                    <xsl:for-each select="(id('upload-rdf-doc', ixsl:page())/.., id('remote-rdf-doc', ixsl:page())/..)">
-                        <xsl:variable name="request" as="item()*">
-                            <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
-                                <xsl:call-template name="onTypeaheadResourceLoad">
-                                    <xsl:with-param name="resource-uri" select="$graph"/>
-                                    <xsl:with-param name="typeahead-span" select="."/>
-                                </xsl:call-template>
-                            </ixsl:schedule-action>
-                        </xsl:variable>
-                        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
-                    </xsl:for-each>
-                </xsl:if>
-
                 <ixsl:set-style name="cursor" select="'default'"/>
             </xsl:for-each>
         </xsl:if>
     </xsl:template>
 
-    <!-- show modal form -->
-    
-    <xsl:template name="ldh:ShowModalForm">
-        <xsl:param name="form" as="element()"/>
-        
-        <!-- don't append the div if it's already there -->
-        <xsl:if test="not(id($form/@id, ixsl:page()))">
-            <xsl:for-each select="ixsl:page()//body">
-                <!-- append modal div to body -->
-                <xsl:result-document href="?." method="ixsl:append-content">
-                    <xsl:sequence select="$form"/>
-                </xsl:result-document>
+    <!-- populate typeahead spans inside a freshly-appended form modal with values from $graph -->
 
-                <ixsl:set-style name="cursor" select="'default'"/>
-            </xsl:for-each>
-        </xsl:if>
+    <xsl:template name="ldh:LoadTypeaheads">
+        <xsl:param name="typeahead-spans" as="element()*"/>
+        <xsl:param name="graph" as="xs:anyURI"/>
+
+        <xsl:variable name="request-uri" select="ldh:href($graph, map{})" as="xs:anyURI"/>
+        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+        <xsl:for-each select="$typeahead-spans">
+            <xsl:variable name="context" as="map(*)" select="
+              map{
+                'request': $request,
+                'resource-uri': $graph,
+                'typeahead-span': .
+              }"/>
+            <ixsl:promise select="
+              ixsl:http-request($context('request'))
+                => ixsl:then(ldh:rethread-response($context, ?))
+                => ixsl:then(ldh:handle-response#1)
+                => ixsl:then(ldh:typeahead-resource-response#1)
+            " on-failure="ldh:promise-failure#1"/>
+        </xsl:for-each>
     </xsl:template>
 
     <!-- render schema classes loaded from a SPARQL endpoint -->
-    
-    <xsl:template name="onEndpointClassesLoad">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="container" as="element()"/>
-        <xsl:param name="arg-bnode-id" select="'generate'" as="xs:string"/>
+
+    <xsl:function name="ldh:endpoint-classes-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="container" select="$context('container')" as="element()"/>
+        <xsl:variable name="arg-bnode-id" select="if (map:contains($context, 'arg-bnode-id')) then $context('arg-bnode-id') else 'generate'" as="xs:string"/>
+
+        <xsl:message>ldh:endpoint-classes-response</xsl:message>
 
         <!-- append the controls for the class list if they don't exist -->
         <xsl:for-each select="$container[not(./div[contains-token(@class, 'endpoint-classes')])]">
@@ -1365,8 +1383,8 @@ LIMIT   10
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
 
         <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/sparql-results+xml'">
-                <xsl:for-each select="?body">
+            <xsl:when test="$status = 200 and $media-type = 'application/sparql-results+xml'">
+                <xsl:for-each select="$response?body">
                     <xsl:variable name="results" select="." as="document-node()"/>
 
                     <!-- populate the class list within div.controls -->
@@ -1406,8 +1424,8 @@ LIMIT   10
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:variable name="message" select="?message" as="xs:string?"/>
-                
+                <xsl:variable name="message" select="$response?message" as="xs:string?"/>
+
                 <xsl:for-each select="$container//div[contains-token(@class, 'endpoint-classes')]/div">
                     <xsl:result-document href="?." method="ixsl:replace-content">
                         <div class="alert alert-block">
@@ -1424,16 +1442,21 @@ LIMIT   10
                 </xsl:for-each>
             </xsl:otherwise>
         </xsl:choose>
-    </xsl:template>
+    </xsl:function>
     
-    <xsl:template name="onTypeaheadResourceLoad">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="resource-uri" as="xs:anyURI"/>
-        <xsl:param name="typeahead-span" as="element()"/>
+    <xsl:function name="ldh:typeahead-resource-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="resource-uri" select="$context('resource-uri')" as="xs:anyURI"/>
+        <xsl:variable name="typeahead-span" select="$context('typeahead-span')" as="element()"/>
+
+        <xsl:message>ldh:typeahead-resource-response</xsl:message>
 
         <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
-                <xsl:for-each select="?body">
+            <xsl:when test="$status = 200 and $media-type = 'application/rdf+xml'">
+                <xsl:for-each select="$response?body">
                     <xsl:variable name="resource" select="key('resources', $resource-uri)" as="element()?"/>
 
                     <xsl:choose>
@@ -1462,22 +1485,28 @@ LIMIT   10
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>
+                <xsl:sequence select="ldh:error-response-alert($context)"/>
             </xsl:otherwise>
         </xsl:choose>
-        
+
         <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-    </xsl:template>
+    </xsl:function>
     
-    <xsl:template name="onAccessResponseLoad">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="agent" as="xs:anyURI"/>
-        <xsl:param name="this" as="xs:anyURI"/>
+    <xsl:function name="ldh:access-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="agent" select="$context('agent')" as="xs:anyURI"/>
+        <xsl:variable name="this" select="$context('this')" as="xs:anyURI"/>
+
+        <xsl:message>ldh:access-response</xsl:message>
 
         <xsl:choose>
-            <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
-                <xsl:variable name="body" select="?body" as="document-node()"/>
-                
+            <xsl:when test="$status = 200 and $media-type = 'application/rdf+xml'">
+                <xsl:variable name="body" select="$response?body" as="document-node()"/>
+                <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+
                 <xsl:call-template name="ldh:ShowModalForm">
                     <xsl:with-param name="form" as="element()">
                         <xsl:apply-templates select="$body" mode="ldh:RequestAccessForm">
@@ -1485,8 +1514,9 @@ LIMIT   10
                             <xsl:with-param name="agent" select="$agent"/>
                         </xsl:apply-templates>
                     </xsl:with-param>
+                    <xsl:with-param name="target" select="$target"/>
                 </xsl:call-template>
-                
+
                 <xsl:for-each select="id('request-access-matrix', ixsl:page())">
                     <xsl:result-document href="?." method="ixsl:replace-content">
                         <xsl:apply-templates select="$body/rdf:RDF" mode="request-access-matrix">
@@ -1497,10 +1527,10 @@ LIMIT   10
                 </xsl:for-each>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ ?message ])"/>
+                <xsl:sequence select="ldh:error-response-alert($context)"/>
             </xsl:otherwise>
         </xsl:choose>
-    </xsl:template>
+    </xsl:function>
 
     <xsl:function name="ldh:settings-form-response" ixsl:updating="yes">
         <xsl:param name="context" as="map(*)"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
index 3c28670c9..d1ab2645f 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
@@ -847,10 +847,13 @@ ORDER BY DESC(?created)
     <!-- opens modal dialog to show instances of a class -->
     <xsl:template match="button[contains-token(@class, 'btn-class')]" mode="ixsl:onclick">
         <xsl:variable name="class-uri" select="xs:anyURI(ixsl:get(., 'dataset.classUri'))"/>
-        <xsl:variable name="container-id" select="'class-instances-container'" as="xs:string"/>
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="pane-id" select="$target/ancestor::div[contains-token(@class, 'tab-pane')]/@id" as="xs:string"/>
+        <xsl:variable name="modal-id" select="'class-instances-modal-' || $pane-id" as="xs:string"/>
+        <xsl:variable name="container-id" select="'class-instances-container-' || $pane-id" as="xs:string"/>
 
         <xsl:variable name="modal" as="element()">
-            <div class="modal modal-constructor fade in" id="class-instances-modal">
+            <div class="modal modal-constructor modal-class-instances fade in" id="{$modal-id}" data-container-id="{$container-id}">
                 <div class="modal-header">
                     <button type="button" class="close">×</button>
                     <legend>
@@ -895,6 +898,7 @@ ORDER BY DESC(?created)
 
         <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" select="$modal"/>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
 
         <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`'))">
@@ -975,7 +979,7 @@ ORDER BY DESC(?created)
     </xsl:template>
 
     <!-- close modals when a link inside them is clicked -->
-    <xsl:template match="div[@id = ('class-instances-modal', 'geo-modal', 'latest-modal', 'search-modal')]//a[@href]" mode="ixsl:onclick" priority="1">
+    <xsl:template match="div[contains-token(@class, 'modal-class-instances') or contains-token(@class, 'modal-geo') or contains-token(@class, 'modal-latest') or contains-token(@class, 'modal-search')]//a[@href]" mode="ixsl:onclick" priority="1">
         <xsl:variable name="modal" select="ancestor::div[contains-token(@class, 'modal')][@id][1]" as="element()"/>
 
         <!-- remove the modal -->
@@ -988,11 +992,14 @@ ORDER BY DESC(?created)
 
     <!-- opens modal dialog to show geo resources -->
     <xsl:template match="button[contains-token(@class, 'btn-geo')]" mode="ixsl:onclick">
-        <xsl:variable name="container-id" select="'geo-container'" as="xs:string"/>
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="pane-id" select="$target/ancestor::div[contains-token(@class, 'tab-pane')]/@id" as="xs:string"/>
+        <xsl:variable name="modal-id" select="'geo-modal-' || $pane-id" as="xs:string"/>
+        <xsl:variable name="container-id" select="'geo-container-' || $pane-id" as="xs:string"/>
         <xsl:variable name="select-string" select="$geo-resources-string" as="xs:string"/>
 
         <xsl:variable name="modal" as="element()">
-            <div class="modal modal-constructor fade in" id="geo-modal">
+            <div class="modal modal-constructor modal-geo fade in" id="{$modal-id}" data-container-id="{$container-id}">
                 <div class="modal-header">
                     <button type="button" class="close">×</button>
                     <legend>
@@ -1009,7 +1016,7 @@ ORDER BY DESC(?created)
                                     </div>
                                 </div>
                             </div>
-                            
+
                             <div id="{$container-id}" class="row-fluid" typeof="&ldh;View">
                                 <div class="main span12">
                                     <!-- View results will be rendered here -->
@@ -1030,6 +1037,7 @@ ORDER BY DESC(?created)
 
         <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" select="$modal"/>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
 
         <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`'))">
@@ -1096,11 +1104,14 @@ ORDER BY DESC(?created)
 
     <!-- opens modal dialog to show latest resources -->
     <xsl:template match="button[contains-token(@class, 'btn-latest')]" mode="ixsl:onclick">
-        <xsl:variable name="container-id" select="'latest-container'" as="xs:string"/>
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="pane-id" select="$target/ancestor::div[contains-token(@class, 'tab-pane')]/@id" as="xs:string"/>
+        <xsl:variable name="modal-id" select="'latest-modal-' || $pane-id" as="xs:string"/>
+        <xsl:variable name="container-id" select="'latest-container-' || $pane-id" as="xs:string"/>
         <xsl:variable name="select-string" select="$latest-resources-string" as="xs:string"/>
 
         <xsl:variable name="modal" as="element()">
-            <div class="modal modal-constructor fade in" id="latest-modal">
+            <div class="modal modal-constructor modal-latest fade in" id="{$modal-id}" data-container-id="{$container-id}">
                 <div class="modal-header">
                     <button type="button" class="close">×</button>
                     <legend>
@@ -1138,6 +1149,7 @@ ORDER BY DESC(?created)
 
         <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" select="$modal"/>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
 
         <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`'))">
@@ -1216,10 +1228,13 @@ ORDER BY DESC(?created)
     <xsl:template match="form[contains-token(@class, 'search-form')]" mode="ixsl:onsubmit">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="text" select=".//input[@name = 'q']/ixsl:get(., 'value')" as="xs:string?"/>
-        <xsl:variable name="container-id" select="'search-results-container'" as="xs:string"/>
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="pane-id" select="$target/ancestor::div[contains-token(@class, 'tab-pane')]/@id" as="xs:string"/>
+        <xsl:variable name="modal-id" select="'search-modal-' || $pane-id" as="xs:string"/>
+        <xsl:variable name="container-id" select="'search-results-container-' || $pane-id" as="xs:string"/>
 
         <xsl:variable name="modal" as="element()">
-            <div class="modal modal-constructor fade in" id="search-modal">
+            <div class="modal modal-constructor modal-search fade in" id="{$modal-id}" data-container-id="{$container-id}">
                 <div class="modal-header">
                     <button type="button" class="close">×</button>
                     <legend>
@@ -1267,6 +1282,7 @@ ORDER BY DESC(?created)
 
         <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" select="$modal"/>
+            <xsl:with-param name="target" select="$target"/>
         </xsl:call-template>
 
         <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`'))">
@@ -1286,7 +1302,7 @@ ORDER BY DESC(?created)
             </xsl:call-template>
         </xsl:if>
 
-        <xsl:for-each select="id('search-modal', ixsl:page())//input[@name = 'q']">
+        <xsl:for-each select="id($modal-id, ixsl:page())//input[@name = 'q']">
             <xsl:sequence select="ixsl:call(., 'focus', [])[current-date() lt xs:date('2000-01-01')]"/>
         </xsl:for-each>
     </xsl:template>
@@ -1295,7 +1311,7 @@ ORDER BY DESC(?created)
     <xsl:template match="form[contains-token(@class, 'search-form-modal')]" mode="ixsl:onsubmit">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
         <xsl:variable name="text" select=".//input[@name = 'q']/ixsl:get(., 'value')" as="xs:string?"/>
-        <xsl:variable name="container-id" select="'search-results-container'" as="xs:string"/>
+        <xsl:variable name="container-id" select="ancestor::div[contains-token(@class, 'modal')][@data-container-id][1]/@data-container-id" as="xs:string"/>
         <xsl:variable name="cache" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`')" as="item()"/>
 
         <xsl:choose>
@@ -1316,11 +1332,11 @@ ORDER BY DESC(?created)
     </xsl:template>
 
     <!-- in-modal search input: debounced live search (form-submit handles Enter) -->
-    <xsl:template match="div[@id = 'search-modal']//input[@name = 'q']" mode="ixsl:onkeyup">
+    <xsl:template match="div[contains-token(@class, 'modal-search')]//input[@name = 'q']" mode="ixsl:onkeyup">
         <xsl:param name="delay" select="400" as="xs:integer"/>
         <xsl:variable name="key-code" select="ixsl:get(ixsl:event(), 'code')" as="xs:string"/>
         <xsl:variable name="text" select="ixsl:get(., 'value')" as="xs:string?"/>
-        <xsl:variable name="container-id" select="'search-results-container'" as="xs:string"/>
+        <xsl:variable name="container-id" select="ancestor::div[contains-token(@class, 'modal')][@data-container-id][1]/@data-container-id" as="xs:string"/>
         <xsl:variable name="cache" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $container-id || '`')" as="item()"/>
 
         <xsl:choose>
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 6bb17506e..ccf0d9158 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -1132,12 +1132,21 @@ WHERE
     <!-- open a form to save RDF document (do nothing if the button is disabled) -->
     
     <xsl:template match="button[contains-token(@class, 'btn-save-as')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
-       <xsl:call-template name="ldh:ShowAddDataForm">
+        <xsl:variable name="target" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'document-body')]/div[contains-token(@class, 'content-body')]" as="element()"/>
+        <xsl:variable name="graph" select="ldh:base-uri(.)" as="xs:anyURI"/>
+
+        <xsl:call-template name="ldh:ShowModalForm">
             <xsl:with-param name="form" as="element()">
                 <xsl:call-template name="ldh:AddDataForm">
-                    <xsl:with-param name="source" select="ldh:base-uri(.)"/> <!-- the arg should really be the RDF/XML document-node() -->
+                    <xsl:with-param name="source" select="$graph"/> <!-- the arg should really be the RDF/XML document-node() -->
                 </xsl:call-template>
             </xsl:with-param>
+            <xsl:with-param name="target" select="$target"/>
+        </xsl:call-template>
+
+        <xsl:call-template name="ldh:LoadTypeaheads">
+            <xsl:with-param name="typeahead-spans" select="(id('upload-rdf-doc', ixsl:page())/.., id('remote-rdf-doc', ixsl:page())/..)"/>
+            <xsl:with-param name="graph" select="$graph"/>
         </xsl:call-template>
     </xsl:template>