diff --git a/http-tests/proxy/GET-proxied-external-502.sh b/http-tests/proxy/GET-proxied-external-502.sh
index 3e297c65b..c0c6bfc45 100755
--- a/http-tests/proxy/GET-proxied-external-502.sh
+++ b/http-tests/proxy/GET-proxied-external-502.sh
@@ -19,6 +19,7 @@ add-agent-to-group.sh \
 
 curl -k -w "%{http_code}\n" -o /dev/null -s \
   -G \
+  -H "Accept: application/n-triples" \
   -E "$AGENT_CERT_FILE":"$AGENT_CERT_PWD" \
   --data-urlencode "uri=http://f1d2d4cf-90bb-4f5b-ae4b-921e584b6edd.org" \
   "$END_USER_BASE_URL" \
diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java b/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java
index 23f635a00..964fefbb9 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java
@@ -16,7 +16,7 @@
  */
 package com.atomgraph.linkeddatahub.server.filter.request;
 
-import com.atomgraph.core.MediaTypes;
+import com.atomgraph.client.MediaTypes;
 import com.atomgraph.client.util.HTMLMediaTypePredicate;
 import com.atomgraph.client.vocabulary.AC;
 import com.atomgraph.core.exception.BadGatewayException;
@@ -84,15 +84,14 @@
  * ACL is not checked for proxy requests: the proxy is a global transport function, not a document
  * operation. Access control is enforced by the target endpoint.
  * <p>
- * This filter intentionally does <em>not</em> proxy requests from clients that explicitly accept
- * (X)HTML. Rendering arbitrary external URIs as (X)HTML through the full server-side pipeline
- * (SPARQL DESCRIBE + XSLT) for every browser-originated proxy request would cause unbounded resource
- * exhaustion — a connection-pool and CPU amplification attack vector. Instead, requests whose
- * {@code Accept} header contains a non-wildcard {@code text/html} or {@code application/xhtml+xml}
- * type fall through to the downstream handler, which serves the LDH application shell; the
- * client-side Saxon-JS layer then issues a second, RDF-typed request that <em>does</em> hit this
- * filter and is handled cheaply. Pure API clients that send only {@code *}{@code /*} (e.g. curl)
- * reach the proxy because they do not list an explicit HTML type.
+ * This filter does <em>not</em> proxy requests from clients that explicitly accept (X)HTML.
+ * Rendering arbitrary external URIs as (X)HTML through the full server-side pipeline
+ * (SPARQL DESCRIBE + XSLT) is expensive and creates a resource-exhaustion attack vector.
+ * When the {@code Accept} header contains a non-wildcard {@code text/html} or
+ * {@code application/xhtml+xml} type, the filter returns immediately so the downstream handler
+ * serves the LDH application shell; the client-side Saxon-JS layer then issues a second, RDF-typed
+ * request that hits this filter and is proxied cheaply. Pure API clients that send only
+ * {@code *}{@code /*} (e.g. curl) reach the proxy because they do not list an explicit HTML type.
  *
  * @author Martynas Jusevičius {@literal <martynas@atomgraph.com>}
  */
@@ -102,11 +101,11 @@ public class ProxyRequestFilter implements ContainerRequestFilter
 {
 
     private static final Logger log = LoggerFactory.getLogger(ProxyRequestFilter.class);
-    private static final MediaTypes MEDIA_TYPES = new MediaTypes();
     private static final Pattern LINK_SPLITTER = Pattern.compile(",(?=\\s*<)");
 
     @Inject com.atomgraph.linkeddatahub.Application system;
     @Inject jakarta.inject.Provider<Optional<Ontology>> ontology;
+    @Inject MediaTypes mediaTypes;
     @Context Request request;
 
     @Override
@@ -117,26 +116,34 @@ public void filter(ContainerRequestContext requestContext) throws IOException
 
         URI targetURI = targetOpt.get();
 
-        // do not proxy requests from clients that explicitly accept (X)HTML — they expect the app shell,
-        // which the downstream handler serves. Browsers list text/html as a non-wildcard type; pure API
-        // clients (curl etc.) send only */* and must reach the proxy.
-        // Defending against resource exhaustion: proxying + full server-side XSLT rendering for arbitrary
-        // external URIs on every browser request would amplify CPU and connection-pool load unboundedly.
+        // do not proxy requests from clients that explicitly accept (X)HTML — they expect the app
+        // shell, which the downstream handler serves. Browsers list text/html as a non-wildcard type;
+        // pure API clients (curl etc.) send only */* and must reach the proxy.
+        // (X)HTML is not offered for proxied documents — rendering external RDF as HTML server-side
+        // (SPARQL DESCRIBE + XSLT) is expensive and creates a resource-exhaustion attack vector
         boolean clientAcceptsHtml = requestContext.getAcceptableMediaTypes().stream()
             .anyMatch(mt -> !mt.isWildcardType() && !mt.isWildcardSubtype() &&
                       (mt.isCompatible(MediaType.TEXT_HTML_TYPE) ||
                        mt.isCompatible(MediaType.APPLICATION_XHTML_XML_TYPE)));
         if (clientAcceptsHtml) return;
 
-        // negotiate the response format from RDF/SPARQL writable types
+        // negotiate the response format from RDF/SPARQL writable types only
+        // (client.MediaTypes prepends HTML/XHTML; strip them so selectVariant cannot pick them)
         List<MediaType> writableTypes = new ArrayList<>(getMediaTypes().getWritable(Model.class));
         writableTypes.addAll(getMediaTypes().getWritable(ResultSet.class));
+        writableTypes.removeIf(mt -> mt.isCompatible(MediaType.TEXT_HTML_TYPE) ||
+            mt.isCompatible(MediaType.APPLICATION_XHTML_XML_TYPE));
         List<Variant> variants = com.atomgraph.core.model.impl.Response.getVariants(
             writableTypes,
             getSystem().getSupportedLanguages(),
             new ArrayList<>());
-        Variant selectedVariant = getRequest().selectVariant(variants);
-        if (selectedVariant == null) return; // client accepts no RDF/SPARQL type
+
+        Variant variant = getRequest().selectVariant(variants);
+        if (variant == null)
+        {
+            if (log.isTraceEnabled()) log.trace("Requested Variant {} is not on the list of acceptable Response Variants: {}", variant, variants);
+            throw new NotAcceptableException();
+        }
 
         // strip #fragment (servers do not receive fragment identifiers)
         if (targetURI.getFragment() != null)
@@ -156,7 +163,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException
         {
             if (log.isDebugEnabled()) log.debug("Serving mapped URI from DataManager cache: {}", targetURI);
             Model model = getSystem().getDataManager().loadModel(targetURI.toString());
-            requestContext.abortWith(getResponse(model, Response.Status.OK, selectedVariant));
+            requestContext.abortWith(getResponse(model, Response.Status.OK, variant));
             return;
         }
 
@@ -174,7 +181,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException
                 if (!description.isEmpty())
                 {
                     if (log.isDebugEnabled()) log.debug("Serving URI from namespace ontology: {}", targetURI);
-                    requestContext.abortWith(getResponse(description, Response.Status.OK, selectedVariant));
+                    requestContext.abortWith(getResponse(description, Response.Status.OK, variant));
                     return;
                 }
             }
@@ -221,7 +228,7 @@ else if (agentContext instanceof IDTokenSecurityContext idTokenSecurityContext)
             {
                 // provide the target URI as a base URI hint so ModelProvider / HtmlJsonLDReader can resolve relative references
                 clientResponse.getHeaders().putSingle(com.atomgraph.core.io.ModelProvider.REQUEST_URI_HEADER, targetURI.toString());
-                requestContext.abortWith(getResponse(clientResponse, selectedVariant));
+                requestContext.abortWith(getResponse(clientResponse, variant));
             }
         }
         catch (MessageBodyProviderNotFoundException ex)
@@ -381,14 +388,13 @@ public Optional<Ontology> getOntology()
     }
 
     /**
-     * Returns the media types registry.
-     * Core MediaTypes do not include (X)HTML types, which is what we want here.
+     * Returns the media types registry used for content negotiation and outbound {@code Accept} headers.
      *
      * @return media types
      */
     public MediaTypes getMediaTypes()
     {
-        return MEDIA_TYPES;
+        return mediaTypes;
     }
 
     /**
diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ResponseHeadersFilter.java b/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ResponseHeadersFilter.java
index 5c9bc4785..770a3dbd2 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ResponseHeadersFilter.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/server/filter/response/ResponseHeadersFilter.java
@@ -26,6 +26,7 @@
 import com.atomgraph.linkeddatahub.server.model.impl.Dispatcher;
 import com.atomgraph.linkeddatahub.server.security.AuthorizationContext;
 import com.atomgraph.linkeddatahub.vocabulary.ACL;
+import com.atomgraph.linkeddatahub.vocabulary.LAPP;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Optional;
@@ -80,6 +81,8 @@ public void filter(ContainerRequestContext request, ContainerResponseContext res
         if (!isProxyRequest && getApplication().isPresent())
         {
             Application application = getApplication().get();
+            // add Link rel=lapp:application
+            response.getHeaders().add(HttpHeaders.LINK, new Link(URI.create(application.getURI()), LAPP.application.getURI(), null));
             // add Link rel=ldt:ontology, if the ontology URI is specified
             if (application.getOntology() != null)
                 response.getHeaders().add(HttpHeaders.LINK, new Link(URI.create(application.getOntology().getURI()), LDT.ontology.getURI(), null));
diff --git a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LAPP.java b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LAPP.java
index 479bf44d3..7ef0a28f1 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LAPP.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LAPP.java
@@ -91,4 +91,7 @@ public static String getURI()
     /** Origin property for subdomain-based application matching */
     public static final ObjectProperty origin = m_model.createObjectProperty(NS + "origin");
 
+    /** Application property (for Link header rel) */
+    public static final ObjectProperty application = m_model.createObjectProperty( NS + "application" );
+
 }
diff --git a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
index 17414f681..e8dcaebfe 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
@@ -92,9 +92,6 @@ public static String getURI()
     /** Violation value property */
     public static final DatatypeProperty violationValue = m_model.createDatatypeProperty( NS + "violationValue" );
     
-    /** Access to property */
-    public static final ObjectProperty access_to = m_model.createObjectProperty(NS + "access-to"); // TO-DO: move to client-side?
-
     /** Request URI property */
     public static final ObjectProperty requestUri = m_model.createObjectProperty(NS + "requestUri");
     
diff --git a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
index 00818c9de..e51e8aae9 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
@@ -90,7 +90,6 @@ public abstract class XSLTWriterBase extends com.atomgraph.client.writer.XSLTWri
     @Inject jakarta.inject.Provider<Optional<com.atomgraph.linkeddatahub.apps.model.Application>> application;
     @Inject jakarta.inject.Provider<DataManager> dataManager;
     @Inject jakarta.inject.Provider<XsltExecutableSupplier> xsltExecSupplier;
-    @Inject jakarta.inject.Provider<List<Mode>> modes;
     @Inject jakarta.inject.Provider<ContainerRequestContext> crc;
     @Inject jakarta.inject.Provider<Optional<AuthorizationContext>> authorizationContext;
 
@@ -134,9 +133,6 @@ public <T extends XdmValue> Map<QName, XdmValue> getParameters(MultivaluedMap<St
             URI endpointURI = getLinkURI(headerMap, SD.endpoint);
             if (endpointURI != null) params.put(new QName("sd", SD.endpoint.getNameSpace(), SD.endpoint.getLocalName()), new XdmAtomicValue(endpointURI));
 
-            URI proxyTargetURI = (URI) getContainerRequestContext().getProperty(AC.uri.getURI());
-            if (proxyTargetURI != null) params.put(new QName("ac", AC.uri.getNameSpace(), AC.uri.getLocalName()), new XdmAtomicValue(proxyTargetURI));
-
             String forShapeURI = getUriInfo().getQueryParameters().getFirst(LDH.forShape.getLocalName());
             if (forShapeURI != null) params.put(new QName("ldh", LDH.forShape.getNameSpace(), LDH.forShape.getLocalName()), new XdmAtomicValue(URI.create(forShapeURI)));
 
@@ -159,11 +155,6 @@ public <T extends XdmValue> Map<QName, XdmValue> getParameters(MultivaluedMap<St
                 params.put(new QName("acl", ACL.mode.getNameSpace(), ACL.mode.getLocalName()),
                     XdmValue.makeSequence(getAuthorizationContext().get().get().getModeURIs()));
 
-            // TO-DO: move to client-side?
-            if (getUriInfo().getQueryParameters().containsKey(LDH.access_to.getLocalName()))
-                params.put(new QName("ldh", LDH.access_to.getNameSpace(), LDH.access_to.getLocalName()),
-                    new XdmAtomicValue(URI.create(getUriInfo().getQueryParameters().getFirst(LDH.access_to.getLocalName()))));
-            
             if (getHttpHeaders().getRequestHeader(HttpHeaders.REFERER) != null)
             {
                 URI referer = URI.create(getHttpHeaders().getRequestHeader(HttpHeaders.REFERER).get(0));
@@ -250,11 +241,7 @@ public StreamSource getSource(Model model) throws IOException
     @Override
     public String getSystemId()
     {
-        // for proxy requests, use the external URI as the XSLT document base URI
-        URI proxyTarget = (URI) getContainerRequestContext().getProperty(AC.uri.getURI());
-        if (proxyTarget != null) return proxyTarget.toString();
-
-        return getContainerRequestContext().getUriInfo().getRequestUri().toString();
+        return getUriInfo().getRequestUri().toString();
     }
     
     /**
@@ -314,22 +301,6 @@ public XsltExecutable getXsltExecutable()
         return xsltExecSupplier.get().get();
     }
     
-    @Override
-    public List<URI> getModes(Set<String> namespaces)
-    {
-        return getModes().stream().map(Mode::get).collect(Collectors.toList());
-    }
-
-    /**
-     * Returns a list of enabled layout modes.
-     * 
-     * @return list of modes
-     */
-    public List<Mode> getModes()
-    {
-        return modes.get();
-    }
-    
     @Override
     public Set<String> getSupportedNamespaces()
     {
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
index c4e40f8f1..323c7b577 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
@@ -1,5 +1,15 @@
 html { height: 100%; }
-body { height: calc(100% - 120px); padding-top: 120px; padding-bottom: 0; }
+/* only the main navbar is fixed-top now; tab bar + action bar are sticky inside #tab-body */
+body { height: calc(100% - 55px); padding-top: 55px; padding-bottom: 0; }
+#tab-bar { position: sticky; top: 55px; z-index: 1000; margin-bottom: 0; }
+/* Override Bootstrap's overflow:auto which would make action-bar sticky relative to #tab-content instead of the viewport */
+#tab-content { overflow: visible; }
+#tab-bar.navbar-inner { min-height: 36px; padding: 4px 0; background: #ccc; box-shadow: none; }
+#tab-bar-list.nav-tabs { margin-bottom: 0; border-bottom: none; }
+#tab-bar-list.nav-tabs > li > a { color: #007fff; padding: 8px 12px; text-shadow: none; border-color: #aaa #aaa transparent; }
+#tab-bar-list.nav-tabs > li.active > a, #tab-bar .nav-tabs > li.active > a:hover { color: #555555; background: rgb(223, 223, 223); border-color: #aaa #aaa transparent; }
+#tab-bar-list .tab-close { margin-left: 4px; font-size: 10px; color: #888; cursor: pointer; vertical-align: middle; }
+#tab-bar-list .tab-close:hover { color: #333; }
 body.embed { padding-top: 0; }
 ul.dropdown-menu { max-height: 26em; overflow-x: hidden; overflow-y: auto; }
 ul.dropdown-menu ul { margin: 0; }
@@ -17,16 +27,17 @@ ul.dropdown-menu ul { margin: 0; }
 .navbar-form .input-append { margin-top: 10px; }
 .navbar-form .input-append select { margin-top: 0; height: 34px; }
 .navbar-form .btn-search { background-image: url('../icons/ic_search_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; }
-.action-bar { background-color: #dfdfdf; }
+.action-bar { position: sticky; top: var(--action-bar-top, 55px); z-index: 999; background: #dfdfdf; padding: 0; box-shadow: none; }
 .action-bar form { margin-bottom: 0; }
 .action-bar .span7 .row-fluid > * { margin-top: 10px; }
+.action-bar .row-fluid > .span2, .action-bar .row-fluid > .span3 { margin-top: 10px; }
 .action-bar .add-constructor, .dropdown-menu .add-constructor { background-color: inherit; display: block; text-align: left; width: 100%; }
 .action-bar .add-constructor:hover { color: #ffffff; background-color: #007af5; }
 .action-bar .breadcrumb { background-color: inherit; margin-bottom: 0; padding-left: 0; padding-top: 5px; }
 .action-bar .breadcrumb .container-logo { background-image: url('../icons/folder.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; }
 .action-bar .breadcrumb .item-logo { background-image: url('../icons/file.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; }
 .action-bar .breadcrumb .btn-group { margin-top: -4px; }
-.action-bar #breadcrumb-nav > .label-info { padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; }
+.action-bar .breadcrumb-nav > .label-info { padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; }
 .action-bar #doc-controls { text-align: right; padding-top: 5px; }
 .action-bar #doc-controls .btn-edit { margin-top: -5px; margin-left: 10px; }
 .action-bar p.alert { margin-bottom: 0; }
@@ -107,10 +118,10 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol
 .caret.caret-reversed { border-bottom: 4px solid #000000; border-top-width: 0; }
 .faceted-nav input[type=checkbox]:checked + span { font-weight: bold; }
 .parallax-nav a { cursor: pointer; }
-#content-body { min-height: calc(100% - 14em); }
-#content-body > [about].row-fluid { overflow-x: auto; margin-bottom: 20px; }
-#content-body > [about].row-fluid, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); }
-#content-body > [about].row-fluid.drag-over { border-bottom: 4px dotted #0f82f5; }
+.content-body { min-height: calc(100% - 14em); margin-top: 14px; }
+.content-body > [about].row-fluid.block { overflow-x: auto; margin-bottom: 20px; }
+.content-body > [about].row-fluid.block, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); }
+.content-body > [about].row-fluid.block.drag-over { border-bottom: 4px dotted #0f82f5; }
 .row-fluid.block { max-height: 80em; }
 .row-fluid.block .drag-handle { display: none; width: 30px; background-color: #149bdf; background-image: radial-gradient(circle at 3px 3px, #0480be 1px, transparent 1.5px); background-size: 6px 6px; border-radius: 2px; cursor: move; }
 .list-mode.active { background-image: url('../icons/ic_navigate_before_black_24px.svg'); }
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl
index 0c4a69c4f..08664947c 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl
@@ -32,18 +32,6 @@ exclude-result-prefixes="#all">
     <xsl:template match="rdf:RDF" mode="bs2:NavBarNavList">
         <xsl:if test="$foaf:Agent//@rdf:about">
             <ul class="nav pull-right">
-<!--                <li>
-                    <xsl:if test="$ac:mode = '&ac;QueryEditorMode'">
-                        <xsl:attribute name="class" select="'active'"/>
-                    </xsl:if>
-
-                    <a href="{ac:build-uri((), map{ 'mode': '&ac;QueryEditorMode' })}" class="query-editor">
-                        <xsl:value-of>
-                            <xsl:apply-templates select="key('resources', 'sparql-editor', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
-                        </xsl:value-of>
-                    </a>
-                </li>-->
-
                 <xsl:variable name="notification-query" as="xs:string">
                     <![CDATA[
 PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl
index 196a41081..8af4a9f6c 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl
@@ -47,7 +47,7 @@ xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
 exclude-result-prefixes="#all">
 
     <xsl:template match="rdf:RDF[ac:absolute-path(ldh:request-uri()) = resolve-uri(encode-for-uri('sign up'), $ldt:base)]" mode="bs2:ContentBody" priority="2" use-when="system-property('xsl:product-name') = 'SAXON'">
-        <div about="{ac:absolute-path(base-uri($main-doc))}" id="content-body" class="container-fluid">
+        <div about="{ac:absolute-path(base-uri($main-doc))}" class="container-fluid content-body">
             <xsl:apply-templates select="key('resources', ac:absolute-path(base-uri($main-doc)))" mode="ldh:ContentList"/>
 
             <xsl:apply-templates select="." mode="bs2:Row"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
index 49a4833e4..ca2ecde5c 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
@@ -181,53 +181,59 @@ exclude-result-prefixes="#all"
 
     <!-- show drag handle on left edge hover, but not when left sidebar is active -->
 
-    <xsl:template match="div[ac:mode() = '&ldh;ContentMode'][contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write'][not(ixsl:style(id('left-sidebar', ixsl:page()))?display = 'block')]" mode="ixsl:onmousemove" priority="2">
-        <xsl:variable name="dom-x" select="ixsl:get(ixsl:event(), 'clientX')" as="xs:double"/>
-        <xsl:variable name="rect" select="ixsl:call(., 'getBoundingClientRect', [])"/>
-        <xsl:variable name="offset-x" select="$dom-x - ixsl:get($rect, 'x')" as="xs:double"/>
-        <xsl:variable name="left-edge-threshold" select="30" as="xs:double"/>
-        
-        <xsl:variable name="drag-handle" select="key('elements-by-class', 'drag-handle', .)[1]" as="element()"/>
-        
-        <!-- check that the mouse is on the left edge -->
-        <xsl:choose>
-            <xsl:when test="$offset-x &lt;= $left-edge-threshold and ixsl:style($drag-handle)?display = 'none'">
-                <!-- get both block and span12 rectangles to calculate intersection -->
-                <xsl:variable name="span12" select="$drag-handle/parent::*[contains-token(@class, 'span12')]" as="element()"/>
-                <xsl:variable name="block-rect" select="$rect"/> <!-- block's getBoundingClientRect -->
-                <xsl:variable name="span12-rect" select="ixsl:call($span12, 'getBoundingClientRect', [])"/>
-                
-                <!-- calculate intersection of block and span12 -->
-                <xsl:variable name="left" select="max((ixsl:get($block-rect, 'left'), ixsl:get($span12-rect, 'left')))" as="xs:double"/>
-                <xsl:variable name="top" select="max((ixsl:get($block-rect, 'top'), ixsl:get($span12-rect, 'top')))" as="xs:double"/>
-                <xsl:variable name="right" select="min((ixsl:get($block-rect, 'right'), ixsl:get($span12-rect, 'right')))" as="xs:double"/>
-                <xsl:variable name="bottom" select="min((ixsl:get($block-rect, 'bottom'), ixsl:get($span12-rect, 'bottom')))" as="xs:double"/>
-                <xsl:variable name="visible-height" select="max((0, $bottom - $top))" as="xs:double"/>
-                
-                <!-- only show drag-handle if there's actually visible area -->
-                <xsl:if test="$visible-height > 0">
-                    <!-- position drag-handle to cover the visible intersection area -->
-                    <ixsl:set-style name="position" select="'fixed'" object="$drag-handle"/>
-                    <ixsl:set-style name="left" select="$left || 'px'" object="$drag-handle"/>
-                    <ixsl:set-style name="top" select="$top || 'px'" object="$drag-handle"/>
-                    <ixsl:set-style name="height" select="$visible-height || 'px'" object="$drag-handle"/>
-                    <ixsl:set-style name="z-index" select="'999'" object="$drag-handle"/>
-                    <!-- enable draggable on the block when drag-handle is shown -->
-                    <ixsl:set-attribute name="draggable" select="'true'" object="."/>
-                    <!-- show drag-handle -->
-                    <ixsl:set-style name="display" select="'block'" object="$drag-handle"/>
-                </xsl:if>
-            </xsl:when>
-            <xsl:when test="$offset-x &gt; $left-edge-threshold and ixsl:style($drag-handle)?display = 'block'">
-                <!-- disable draggable on the block when drag-handle is hidden -->
-                <ixsl:set-attribute name="draggable" select="'false'" object="."/>
-                <!-- hide drag-handle when mouse moves away from left edge -->
-                <ixsl:set-style name="display" select="'none'" object="$drag-handle"/>
-            </xsl:when>
-        </xsl:choose>
-        
-        <!-- call the next matching template to preserve existing block controls functionality -->
-        <xsl:next-match/>
+    <xsl:template match="div[contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write'][not(ixsl:style(id('left-sidebar', ixsl:page()))?display = 'block')]" mode="ixsl:onmousemove" priority="2">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
+ 
+        <xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
+            <xsl:variable name="dom-x" select="ixsl:get(ixsl:event(), 'clientX')" as="xs:double"/>
+            <xsl:variable name="rect" select="ixsl:call(., 'getBoundingClientRect', [])"/>
+            <xsl:variable name="offset-x" select="$dom-x - ixsl:get($rect, 'x')" as="xs:double"/>
+            <xsl:variable name="left-edge-threshold" select="30" as="xs:double"/>
+
+            <xsl:variable name="drag-handle" select="key('elements-by-class', 'drag-handle', .)[1]" as="element()"/>
+
+            <!-- check that the mouse is on the left edge -->
+            <xsl:choose>
+                <xsl:when test="$offset-x &lt;= $left-edge-threshold and ixsl:style($drag-handle)?display = 'none'">
+                    <!-- get both block and span12 rectangles to calculate intersection -->
+                    <xsl:variable name="span12" select="$drag-handle/parent::*[contains-token(@class, 'span12')]" as="element()"/>
+                    <xsl:variable name="block-rect" select="$rect"/> <!-- block's getBoundingClientRect -->
+                    <xsl:variable name="span12-rect" select="ixsl:call($span12, 'getBoundingClientRect', [])"/>
+
+                    <!-- calculate intersection of block and span12 -->
+                    <xsl:variable name="left" select="max((ixsl:get($block-rect, 'left'), ixsl:get($span12-rect, 'left')))" as="xs:double"/>
+                    <xsl:variable name="top" select="max((ixsl:get($block-rect, 'top'), ixsl:get($span12-rect, 'top')))" as="xs:double"/>
+                    <xsl:variable name="right" select="min((ixsl:get($block-rect, 'right'), ixsl:get($span12-rect, 'right')))" as="xs:double"/>
+                    <xsl:variable name="bottom" select="min((ixsl:get($block-rect, 'bottom'), ixsl:get($span12-rect, 'bottom')))" as="xs:double"/>
+                    <xsl:variable name="visible-height" select="max((0, $bottom - $top))" as="xs:double"/>
+
+                    <!-- only show drag-handle if there's actually visible area -->
+                    <xsl:if test="$visible-height > 0">
+                        <!-- position drag-handle to cover the visible intersection area -->
+                        <ixsl:set-style name="position" select="'fixed'" object="$drag-handle"/>
+                        <ixsl:set-style name="left" select="$left || 'px'" object="$drag-handle"/>
+                        <ixsl:set-style name="top" select="$top || 'px'" object="$drag-handle"/>
+                        <ixsl:set-style name="height" select="$visible-height || 'px'" object="$drag-handle"/>
+                        <ixsl:set-style name="z-index" select="'999'" object="$drag-handle"/>
+                        <!-- enable draggable on the block when drag-handle is shown -->
+                        <ixsl:set-attribute name="draggable" select="'true'" object="."/>
+                        <!-- show drag-handle -->
+                        <ixsl:set-style name="display" select="'block'" object="$drag-handle"/>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:when test="$offset-x &gt; $left-edge-threshold and ixsl:style($drag-handle)?display = 'block'">
+                    <!-- disable draggable on the block when drag-handle is hidden -->
+                    <ixsl:set-attribute name="draggable" select="'false'" object="."/>
+                    <!-- hide drag-handle when mouse moves away from left edge -->
+                    <ixsl:set-style name="display" select="'none'" object="$drag-handle"/>
+                </xsl:when>
+            </xsl:choose>
+
+            <!-- call the next matching template to preserve existing block controls functionality -->
+            <xsl:next-match/>
+        </xsl:if>
     </xsl:template>
     
     <!-- hide drag handle when mouse leaves block -->
@@ -325,7 +331,7 @@ exclude-result-prefixes="#all"
     
     <xsl:template match="div[contains-token(@class, 'drag-handle')]" mode="ixsl:ondragstart">
         <!-- find the parent block to drag -->
-        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][parent::div[@id = 'content-body']][1]" as="element()?"/>
+        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][parent::div[@about][parent::div[contains-token(@class, 'content-body')]]][1]" as="element()?"/>
         <xsl:for-each select="$block">
             <ixsl:set-property name="dataTransfer.effectAllowed" select="'move'" object="ixsl:event()"/>
             <xsl:variable name="block-uri" select="@about" as="xs:anyURI"/>
@@ -348,75 +354,100 @@ exclude-result-prefixes="#all"
     </xsl:template>
 
     <!-- dragging block over other block -->
-
-    <xsl:template match="div[@id = 'content-body']/div[ac:mode() = '&ldh;ContentMode'][@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragover">
-        <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
-        <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
-        <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
-        <xsl:if test="$has-uri-item">
-            <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-            <ixsl:set-property name="dataTransfer.dropEffect" select="'move'" object="ixsl:event()"/>
+    <!-- only handle if drag originated from drag-handle (has text/uri-list item) --> 
+
+    <xsl:template match="div[contains-token(@class, 'content-body')]/div[@about]/div[@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragover">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
+
+        <xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
+            <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
+            <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
+            <xsl:if test="$has-uri-item">
+                <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+                <ixsl:set-property name="dataTransfer.dropEffect" select="'move'" object="ixsl:event()"/>
+            </xsl:if>
         </xsl:if>
     </xsl:template>
 
     <!-- change the style of blocks when block is dragged over them -->
-
-    <xsl:template match="div[@id = 'content-body']/div[ac:mode() = '&ldh;ContentMode'][@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragenter">
-        <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
-        <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
-        <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
-        <xsl:if test="$has-uri-item">
-            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', true() ])[current-date() lt xs:date('2000-01-01')]"/>
+    <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
+
+    <xsl:template match="div[contains-token(@class, 'content-body')]/div[@about]/div[@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragenter">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
+
+        <xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
+            <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
+            <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
+            <xsl:if test="$has-uri-item">
+                <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', true() ])[current-date() lt xs:date('2000-01-01')]"/>
+            </xsl:if>
         </xsl:if>
     </xsl:template>
 
-    <xsl:template match="div[@id = 'content-body']/div[ac:mode() = '&ldh;ContentMode'][@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragleave">
-        <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
-        <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
-        <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
-        <xsl:if test="$has-uri-item">
-            <xsl:variable name="related-target" select="ixsl:get(ixsl:event(), 'relatedTarget')" as="element()?"/> <!-- the element drag entered (optional) -->
+    <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
 
-            <!-- only remove class if the related target does not have this div as ancestor (is not its child) -->
-            <xsl:if test="not($related-target/ancestor-or-self::div[. is current()])">
-                <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+    <xsl:template match="div[contains-token(@class, 'content-body')]/div[@about]/div[@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondragleave">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
+
+        <xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
+            <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
+            <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
+            <xsl:if test="$has-uri-item">
+                <xsl:variable name="related-target" select="ixsl:get(ixsl:event(), 'relatedTarget')" as="element()?"/> <!-- the element drag entered (optional) -->
+
+                <!-- only remove class if the related target does not have this div as ancestor (is not its child) -->
+                <xsl:if test="not($related-target/ancestor-or-self::div[. is current()])">
+                    <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+                </xsl:if>
             </xsl:if>
         </xsl:if>
     </xsl:template>
 
     <!-- dropping block over other top-level block -->
+    <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
 
-    <xsl:template match="div[@id = 'content-body']/div[ac:mode() = '&ldh;ContentMode'][@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondrop">
-        <!-- only handle if drag originated from drag-handle (has text/uri-list item) -->
-        <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
-        <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
-        <xsl:if test="$has-uri-item">
-            <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-            <xsl:variable name="block-uri" select="@about" as="xs:anyURI?"/>
-            <xsl:variable name="drop-block-uri" select="ixsl:call(ixsl:get(ixsl:event(), 'dataTransfer'), 'getData', [ 'text/uri-list' ])" as="xs:anyURI"/>
-
-            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', false() ])[current-date() lt xs:date('2000-01-01')]"/>
-
-            <!-- only persist the change if the block is already saved and has an @about -->
-            <xsl:if test="$block-uri">
-                <!-- move dropped element after this element, if they're not the same -->
-                <xsl:if test="not($block-uri = $drop-block-uri)">
-                    <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
+    <xsl:template match="div[contains-token(@class, 'content-body')]/div[@about]/div[@about][contains-token(@class, 'block')][acl:mode() = '&acl;Write']" mode="ixsl:ondrop">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
 
-                    <!-- TO-DO: sketchy workaround to select block-level elements only because we might have duplicate @about values -->
-                    <xsl:variable name="drop-block" select="key('element-by-about', $drop-block-uri)[contains-token(@class, 'block')]" as="element()"/>
-                    <xsl:sequence select="ixsl:call(., 'after', [ $drop-block ])"/>
-                    <!-- TO-DO: use a VALUES block instead -->
-                    <xsl:variable name="update-string" select="replace($block-swap-string, '$this', '&lt;' || ac:absolute-path(ldh:base-uri(.)) || '&gt;', 'q')" as="xs:string"/>
-                    <xsl:variable name="update-string" select="replace($update-string, '$targetBlock', '&lt;' || $block-uri || '&gt;', 'q')" as="xs:string"/>
-                    <xsl:variable name="update-string" select="replace($update-string, '$sourceBlock', '&lt;' || $drop-block-uri || '&gt;', 'q')" as="xs:string"/>
-                    <xsl:variable name="request-uri" select="ldh:href(ac:absolute-path(ldh:base-uri(.)), map{})" as="xs:anyURI"/>
-                    <xsl:variable name="request" as="item()*">
-                        <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
-                            <xsl:call-template name="onBlockSwap"/>
-                        </ixsl:schedule-action>
-                    </xsl:variable>
-                    <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+        <xsl:if test="$mode = xs:anyURI('&ldh;ContentMode')">
+            <xsl:variable name="items" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'items')"/>
+            <xsl:variable name="has-uri-item" select="if (ixsl:get($items, 'length') > 0) then ixsl:get(ixsl:get($items, '0'), 'type') = 'text/uri-list' else false()" as="xs:boolean"/>
+            <xsl:if test="$has-uri-item">
+                <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+                <xsl:variable name="block-uri" select="@about" as="xs:anyURI?"/>
+                <xsl:variable name="drop-block-uri" select="ixsl:call(ixsl:get(ixsl:event(), 'dataTransfer'), 'getData', [ 'text/uri-list' ])" as="xs:anyURI"/>
+
+                <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'drag-over', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+
+                <!-- only persist the change if the block is already saved and has an @about -->
+                <xsl:if test="$block-uri">
+                    <!-- move dropped element after this element, if they're not the same -->
+                    <xsl:if test="not($block-uri = $drop-block-uri)">
+                        <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
+
+                        <!-- TO-DO: sketchy workaround to select block-level elements only because we might have duplicate @about values -->
+                        <xsl:variable name="drop-block" select="key('element-by-about', $drop-block-uri)[contains-token(@class, 'block')]" as="element()"/>
+                        <xsl:sequence select="ixsl:call(., 'after', [ $drop-block ])"/>
+                        <!-- TO-DO: use a VALUES block instead -->
+                        <xsl:variable name="update-string" select="replace($block-swap-string, '$this', '&lt;' || ac:absolute-path(ldh:base-uri(.)) || '&gt;', 'q')" as="xs:string"/>
+                        <xsl:variable name="update-string" select="replace($update-string, '$targetBlock', '&lt;' || $block-uri || '&gt;', 'q')" as="xs:string"/>
+                        <xsl:variable name="update-string" select="replace($update-string, '$sourceBlock', '&lt;' || $drop-block-uri || '&gt;', 'q')" as="xs:string"/>
+                        <xsl:variable name="request-uri" select="ldh:href(ac:absolute-path(ldh:base-uri(.)), map{})" as="xs:anyURI"/>
+                        <xsl:variable name="request" as="item()*">
+                            <ixsl:schedule-action http-request="map{ 'method': 'PATCH', 'href': $request-uri, 'media-type': 'application/sparql-update', 'body': $update-string }">
+                                <xsl:call-template name="onBlockSwap"/>
+                            </ixsl:schedule-action>
+                        </xsl:variable>
+                        <xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
+                    </xsl:if>
                 </xsl:if>
             </xsl:if>
         </xsl:if>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
index 0f17e1fdb..7c3c0bd54 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
@@ -584,7 +584,7 @@ exclude-result-prefixes="#all"
     
     <!-- create chart onclick (appends a new chart block after this, with query and category/series fields filled out) -->
     
-    <xsl:template match="div[@about][@typeof]//button[contains-token(@class, 'btn-create-chart')]" mode="ixsl:onclick">
+    <xsl:template match="div[contains-token(@class, 'block')][@about][@typeof]//button[contains-token(@class, 'btn-create-chart')]" mode="ixsl:onclick">
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
         <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:variable name="textarea-id" select="$block//textarea[@name = 'query']/ixsl:get(., 'id')" as="xs:string"/>
@@ -774,7 +774,7 @@ exclude-result-prefixes="#all"
                         <!-- TO-DO: use SPARQLBuilder to set LIMIT -->
                         <!--<xsl:variable name="query-string" select="concat($query-string, ' LIMIT 100')" as="xs:string"/>-->
                         <xsl:variable name="service-uri" select="xs:anyURI(key('resources', $query-uri)/ldh:service/@rdf:resource)" as="xs:anyURI?"/>
-                        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+                        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
                         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
                         <xsl:variable name="request-uri" select="ldh:href($endpoint, map{})" as="xs:anyURI"/>
 
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
index d1aef2a84..5ab2a3ae1 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
@@ -189,7 +189,7 @@ exclude-result-prefixes="#all"
                             <xsl:choose>
                                 <xsl:when test="$service-uri">
                                     <!-- need to explicitly request RDF/XML, otherwise we get HTML -->
-                                    <xsl:variable name="request-uri" select="ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+                                    <xsl:variable name="request-uri" select="ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ())" as="xs:anyURI"/>
                                     <!-- TO-DO: refactor asynchronously -->
                                     <xsl:apply-templates select="key('resources', $service-uri, document($request-uri))" mode="ldh:Typeahead">
                                         <xsl:with-param name="forClass" select="$forClass"/>
@@ -267,7 +267,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="query-string" select="ixsl:call($yasqe, 'getValue', [])" as="xs:string"/> <!-- get query string from YASQE -->
         <xsl:variable name="service-control-group" select="descendant::div[contains-token(@class, 'control-group')][input[@name = 'pu'][@value = '&ldh;service']]" as="element()"/>
         <xsl:variable name="service-uri" select="$service-control-group/descendant::input[@name = 'ou']/ixsl:get(., 'value')" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
         <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:variable name="container" select="$block" as="element()"/> <!-- since we're not in content mode -->
@@ -380,7 +380,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="yasqe" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.yasqe'), $textarea-id)"/>
         <xsl:variable name="query-string" select="ixsl:call($yasqe, 'getValue', [])" as="xs:string"/> <!-- get query string from YASQE -->
         <xsl:variable name="service-uri" select="$form//select[contains-token(@class, 'input-query-service')]/ixsl:get(., 'value')" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
         <xsl:variable name="query-id" select="'id' || ac:uuid()" as="xs:string"/>
         <xsl:variable name="query-uri" select="xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $query-id)" as="xs:anyURI"/>
@@ -449,7 +449,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="service-uri" select="ancestor::form/descendant::select[contains-token(@class, 'input-query-service')]/ixsl:get(., 'value')" as="xs:anyURI?"/>
         <xsl:variable name="query-type" select="ldh:query-type($query-string)" as="xs:string?"/>
         <!-- not using ldh:base-uri(.) because it goes stale when DOM is replaced -->
-        <xsl:variable name="doc" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(xs:anyURI(ixsl:location())) || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="doc" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || ac:absolute-path(ldh:request-uri()) || '`'), 'results')" as="document-node()"/>
         <!-- TO-DO: this breaks if the query resource has not yet been loaded as part of the $doc (e.g. freshly saved) -->
         <xsl:variable name="query" select="key('resources', $about, $doc)" as="element()"/>
        
@@ -495,7 +495,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="yasqe" select="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.yasqe'), $textarea/ixsl:get(., 'id'))"/>
         <xsl:variable name="query-string" select="ixsl:call($yasqe, 'getValue', [])" as="xs:string?"/> <!-- get query string from YASQE -->
         <xsl:variable name="service-uri" select="descendant::select[contains-token(@class, 'input-query-service')]/ixsl:get(., 'value')" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
         <xsl:variable name="query-type" select="ldh:query-type($query-string)" as="xs:string?"/>
 
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
index 4d99429e4..0d1998b51 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
@@ -1741,7 +1741,7 @@ exclude-result-prefixes="#all"
                         <xsl:variable name="initial-var-name" select="$select-xml/json:map/json:array[@key = 'variables']/json:string[1]/substring-after(., '?')" as="xs:string"/>
                         <xsl:variable name="focus-var-name" select="$initial-var-name" as="xs:string"/>
                         <!-- service can be explicitly specified on content using ldh:service -->
-                        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+                        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
                         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
 
                         <xsl:choose>
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 ef590b72d..8ed6f80d9 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
@@ -233,36 +233,11 @@ WHERE
         </xsl:for-each>
     </xsl:template>
     
-<!--    <xsl:template name="bs2:AccessRequestComplete">
-        <xsl:context-item as="map(*)" use="required"/>
-        <xsl:param name="created-uri" select="?headers?location" as="xs:anyURI"/>
-
-        <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
-        
-        <xsl:for-each select="id('content-body', ixsl:page())">
-            <xsl:result-document href="?." method="ixsl:replace-content">
-                <div class="row-fluid">
-                    <div class="offset2 span7">
-                        <div class="alert alert-success row-fluid ">
-                            <div class="span1">
-                                <img src="{resolve-uri('static/com/atomgraph/linkeddatahub/icons/baseline_done_white_48dp.png', $ac:contextUri)}" alt="Request created"/>
-                            </div>
-                            <div class="span11">
-                                <p>Your access request has been created.</p>
-                                <p>You will be notified when the administrator approves or rejects it.</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </xsl:result-document>
-        </xsl:for-each>
-    </xsl:template>-->
-    
     <!-- EVENT HANDLERS -->
     
     <!-- enable inline editing form (do nothing if the button is disabled) -->
     
-    <xsl:template match="div[@about]//button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
+    <xsl:template match="div[contains-token(@class, 'block')][@about]//button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
         <xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
 
@@ -907,7 +882,6 @@ WHERE
         <xsl:param name="method" select="'post'" as="xs:string"/>
         <xsl:param name="container" select="ancestor::div[contains-token(@class, 'row-fluid')][1]" as="element()"/>
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])[current-date() lt xs:date('2000-01-01')]"/>
-        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
         <xsl:variable name="forClass" select="@data-for-class" as="xs:anyURI"/>
         <xsl:variable name="constructed-doc" select="ldh:construct-forClass($forClass)" as="document-node()"/>
         <xsl:variable name="doc-uri" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
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 d121bd30e..1453f2a70 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,8 +41,8 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="xs:anyURI(ixsl:location())"/>
     </xsl:function>
 
-    <xsl:function name="ac:uri" as="xs:anyURI?">
-        <xsl:sequence select="if (ixsl:query-params()?uri) then xs:anyURI(ixsl:query-params()?uri) else ()"/>
+    <xsl:function name="ldh:query-params" as="map(xs:string, xs:string*)">
+        <xsl:sequence select="ixsl:query-params()"/>
     </xsl:function>
 
     <xsl:function name="ldh:base-uri" as="xs:anyURI">
@@ -54,7 +54,7 @@ exclude-result-prefixes="#all"
             </xsl:when>
             <xsl:otherwise>
                 <!-- ignore query params such as ?mode -->
-                <xsl:sequence select="ac:absolute-path(xs:anyURI(ixsl:location()))"/>
+                <xsl:sequence select="ac:absolute-path(ldh:request-uri())"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
@@ -67,7 +67,7 @@ exclude-result-prefixes="#all"
     </xsl:function>
     
     <xsl:function name="ldt:base" as="xs:anyURI">
-        <xsl:sequence select="xs:anyURI(lapp:origin(xs:anyURI(ixsl:location())) || '/')"/>
+        <xsl:sequence select="xs:anyURI(lapp:origin(ldh:request-uri()) || '/')"/>
     </xsl:function>
 
     <xsl:function name="acl:mode" as="xs:anyURI*">
@@ -79,33 +79,20 @@ exclude-result-prefixes="#all"
         )"/>
     </xsl:function>
     
-    <xsl:function name="ac:mode" as="xs:anyURI*">
-        <xsl:variable name="mode-button" select="id('layout-modes', ixsl:page())" as="element()?"/>
-        <xsl:variable name="dropdown-menu" select="$mode-button/following-sibling::ul[contains-token(@class, 'dropdown-menu')]" as="element()?"/>
-        <xsl:variable name="active-item-class" select="$dropdown-menu/li[contains-token(@class, 'active')]/@class" as="xs:string?"/>
-        <xsl:variable name="mode-classes" as="map(xs:string, xs:string)">
-            <xsl:map>
-                <xsl:map-entry key="'content-mode'" select="'&ldh;ContentMode'"/>
-                <xsl:map-entry key="'read-mode'" select="'&ac;ReadMode'"/>
-                <xsl:map-entry key="'map-mode'" select="'&ac;MapMode'"/>
-                <xsl:map-entry key="'chart-mode'" select="'&ac;ChartMode'"/>
-                <xsl:map-entry key="'graph-mode'" select="'&ac;GraphMode'"/>
-            </xsl:map>
-        </xsl:variable>
-        <xsl:variable name="mode-class" select="map:keys($mode-classes)[contains-token($active-item-class, .)]" as="xs:string?"/>
-        <xsl:sequence select="if ($mode-class) then xs:anyURI(map:get($mode-classes, $mode-class)) else ()"/>
-    </xsl:function>
-    
     <xsl:function name="sd:endpoint" as="xs:anyURI">
-        <xsl:sequence select="if (ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub'), 'endpoint'))
-            then xs:anyURI(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub'), 'endpoint'))
-            else resolve-uri('sparql', ldt:base())"/>
+        <xsl:variable name="active-tab-li" select="id('tab-bar-list', ixsl:page())/li[contains-token(@class, 'active')]" as="element()?"/>
+        <xsl:sequence select="if ($active-tab-li) then xs:anyURI(ixsl:get($active-tab-li, 'dataset.endpoint')) else resolve-uri('sparql', ldt:base())"/>
+    </xsl:function>
+
+    <xsl:function name="lapp:application" as="xs:anyURI?">
+        <xsl:variable name="active-tab-li" select="id('tab-bar-list', ixsl:page())/li[contains-token(@class, 'active')]" as="element()?"/>
+        <xsl:sequence select="if ($active-tab-li) then xs:anyURI(ixsl:get($active-tab-li, 'dataset.application')) else ()"/>
     </xsl:function>
     
     <xsl:function name="ldh:query-type" as="xs:string?">
         <xsl:param name="query-string" as="xs:string"/>
         
-        <xsl:sequence xmlns:fn="http://www.w3.org/2005/xpath-functions" select="analyze-string($query-string, '[^a-zA-Z]?(SELECT|ASK|DESCRIBE|CONSTRUCT)[^a-zA-Z]', 'i')/fn:match[1]/fn:group[@nr = '1']/string() => upper-case()"/>
+        <xsl:sequence select="analyze-string($query-string, '[^a-zA-Z]?(SELECT|ASK|DESCRIBE|CONSTRUCT)[^a-zA-Z]', 'i')/fn:match[1]/fn:group[@nr = '1']/string() => upper-case()"/>
     </xsl:function>
 
     <xsl:function name="ldh:new-object">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl
index b9219fecd..9e0e05698 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl
@@ -21,7 +21,7 @@
         <xsl:copy>
             <xsl:apply-templates select="@* | node()" mode="#current"/>
 
-            <xsl:variable name="existing-rdf" select="root(.)" as="document-node()"/>
+            <xsl:variable name="existing-rdf" select="root()" as="document-node()"/>
             <!-- Add new descriptions (URI-identified or blank nodes) that don't exist in the existing document -->
             <!-- Blank node IDs are prefixed per-document during normalization, so no conflicts -->
             <xsl:for-each select="$new-rdf/rdf:RDF/*[@rdf:about or @rdf:nodeID]">
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 091c3a4af..c268690ba 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
@@ -154,14 +154,14 @@ LIMIT   10
                                     <button type="button" class="btn dropdown-toggle create-action"></button>
                                     <ul class="dropdown-menu">
                                         <li>
-                                            <button data-for-class="&dh;Container" href="{ldh:href(ac:absolute-path(ldh:base-uri(.)), ldh:query-params(xs:anyURI('&ac;ModalMode'), xs:anyURI('&dh;Container')))}" class="btn add-constructor" title="&dh;Container" id="{generate-id()}-remote-rdf-container">
+                                            <button data-for-class="&dh;Container" href="{ldh:href(ac:absolute-path(ldh:base-uri(.)), ldh:build-query(xs:anyURI('&ac;ModalMode'), xs:anyURI('&dh;Container')))}" class="btn add-constructor" title="&dh;Container" id="{generate-id()}-remote-rdf-container">
                                                 <xsl:value-of>
                                                     <xsl:apply-templates select="key('resources', '&dh;Container', document(ac:document-uri('&dh;')))" mode="ac:label"/>
                                                 </xsl:value-of>
                                             </button>
                                         </li>
                                         <li>
-                                            <button data-for-class="&dh;Item" href="{ldh:href(ac:absolute-path(ldh:base-uri(.)), ldh:query-params(xs:anyURI('&ac;ModalMode'), xs:anyURI('&dh;Item')))}" type="button" class="btn add-constructor" title="&dh;Item" id="{generate-id()}-remote-rdf-item">
+                                            <button data-for-class="&dh;Item" href="{ldh:href(ac:absolute-path(ldh:base-uri(.)), ldh:build-query(xs:anyURI('&ac;ModalMode'), xs:anyURI('&dh;Item')))}" type="button" class="btn add-constructor" title="&dh;Item" id="{generate-id()}-remote-rdf-item">
                                                 <xsl:value-of>
                                                     <xsl:apply-templates select="key('resources', '&dh;Item', document(ac:document-uri('&dh;')))" mode="ac:label"/>
                                                 </xsl:value-of>
@@ -728,7 +728,7 @@ LIMIT   10
     <!-- shows new SPIN-constructed document as a modal form -->
     <xsl:template match="div[contains-token(@class, 'action-bar')]//button[contains-token(@class, 'add-constructor')][@data-for-class]" mode="ixsl:onclick" priority="2">
         <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])[current-date() lt xs:date('2000-01-01')]"/>
-        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
+        <xsl:variable name="content-body" select="ancestor::div[contains-token(@class, 'content-body')][1]" as="element()"/>
         <xsl:variable name="forClass" select="@data-for-class" as="xs:anyURI"/>
         <xsl:variable name="constructed-doc" select="ldh:construct-forClass($forClass)" as="document-node()"/>
         <xsl:variable name="doc-uri" select="resolve-uri(ac:uuid() || '/', ac:absolute-path(ldh:base-uri(.)))" as="xs:anyURI"/> <!-- build a relative URI for the child document -->
@@ -802,12 +802,12 @@ LIMIT   10
     
     <!-- open a form for document editing -->
     
-    <xsl:template match="div[contains-token(@class, 'action-bar')]//button[contains-token(@class, 'btn-edit')]" mode="ixsl:onclick">
+    <xsl:template match="div[contains-token(@class, 'action-bar')]//button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick">
         <xsl:param name="about" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/> <!-- editing the current document resources -->
         <xsl:param name="method" select="'patch'" as="xs:string"/>
         <xsl:param name="form-actions-class" select="'form-actions modal-footer'" as="xs:string?"/>
         <xsl:param name="button-class" select="'btn btn-primary wymupdate'" as="xs:string?"/>
-        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
+        <xsl:variable name="content-body" select="ancestor::div[contains-token(@class, 'content-body')][1]" as="element()"/>
 
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
 
@@ -998,13 +998,13 @@ LIMIT   10
     <xsl:template match="button[contains-token(@class, 'btn-app-settings')]" mode="ixsl:onclick">
         <xsl:param name="id" select="'app-settings'" as="xs:string?"/>
         <xsl:param name="method" select="'patch'" as="xs:string"/>
-        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
+        <xsl:variable name="content-body" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'content-body') and contains-token(@class, 'active')]" as="element()"/>
 
         <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
 
         <xsl:for-each select="$content-body">
             <xsl:result-document href="?." method="ixsl:append-content">
-                <div class="modal modal-constructor fade in" about="{$lapp:application}">
+                <div class="modal modal-constructor fade in" about="{lapp:application()}">
                     <xsl:if test="$id">
                         <xsl:attribute name="id" select="$id"/>
                     </xsl:if>
@@ -1032,7 +1032,7 @@ LIMIT   10
           map{
             'request': $request,
             'block': $block,
-            'about': $lapp:application,
+            'about': lapp:application(),
             'method': $method,
             'action': resolve-uri('settings', ldt:base())
           }"/>
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 43886b8c5..560c08b7d 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
@@ -356,7 +356,7 @@ ORDER BY DESC(?created)
         <xsl:variable name="block-uri" select="$block/@about" as="xs:anyURI"/>
         <xsl:variable name="query-string" select="replace($backlinks-string, '$this', '&lt;' || $block-uri || '&gt;', 'q')" as="xs:string"/>
         <xsl:variable name="service-uri" select="if (ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`')) then (if (ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'service-uri')) then ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'service-uri') else ()) else ()" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
         <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), sd:endpoint())[1]" as="xs:anyURI"/>
         <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': string($query-string) })" as="xs:anyURI"/>
         <xsl:variable name="request-uri" select="ldh:href($results-uri, map{})" as="xs:anyURI"/>
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 81941e5ea..11602815b 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
@@ -164,6 +164,30 @@ extension-element-prefixes="ixsl"
             </xsl:if>
         </div>
     </xsl:template>
+        
+    <xsl:template match="rdf:RDF[acl:mode() = '&acl;Append']" mode="bs2:AddData" priority="1">
+        <div class="btn-group pull-left">
+            <button type="button" class="btn btn-primary dropdown-toggle" title="{ac:label(key('resources', 'add', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}">
+                <xsl:value-of>
+                    <xsl:apply-templates select="key('resources', 'add', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
+                </xsl:value-of>
+                <xsl:text> </xsl:text>
+                <span class="caret"></span>
+            </button>
+            
+            <ul class="dropdown-menu">
+                <li>
+                    <button type="button" title="{ac:label(key('resources', 'generate-containers-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}" class="btn btn-generate-containers">
+                        <xsl:value-of>
+                            <xsl:apply-templates select="key('resources', 'generate-containers', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
+                        </xsl:value-of>
+                    </button>
+                </li>
+            </ul>
+        </div>
+    </xsl:template>
+    
+    <xsl:template match="*" mode="bs2:AddData"/>
     
     <xsl:template match="rdf:RDF | srx:sparql" mode="bs2:ActionBarMain">
         <xsl:param name="id" as="xs:string?"/>
@@ -179,7 +203,7 @@ extension-element-prefixes="ixsl"
             
             <div class="row-fluid">
                 <xsl:apply-templates select="." mode="bs2:BreadCrumbBar">
-                    <xsl:with-param name="id" select="'breadcrumb-nav'"/>
+                    <xsl:with-param name="class" select="'breadcrumb-nav span8'"/>
                     <xsl:with-param name="uri" select="ac:absolute-path(ldh:base-uri(.))"/>
                 </xsl:apply-templates>
                 
@@ -242,19 +266,80 @@ extension-element-prefixes="ixsl"
 
     <xsl:template match="srx:sparql" mode="bs2:BreadCrumbBar"/>
     
+    <!-- NAVBAR ACTIONS -->
+
+    <xsl:template match="srx:sparql" mode="bs2:NavBarActions" priority="1">
+        <xsl:next-match>
+            <xsl:with-param name="save-as-disabled" select="true()"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <xsl:template match="rdf:RDF" mode="bs2:NavBarActions">
+        <xsl:param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
+        <xsl:param name="delete-disabled" select="not(acl:mode() = '&acl;Write')" as="xs:boolean"/>
+        <xsl:param name="save-as-disabled" select="false()" as="xs:boolean"/>
+        <xsl:param name="edit-disabled" select="not(acl:mode() = '&acl;Write')" as="xs:boolean"/>
+        
+        <xsl:if test="$foaf:Agent//@rdf:about">
+            <div class="pull-right">
+                <button type="button" title="{ac:label(key('resources', 'nav-bar-action-delete-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}">
+                    <xsl:apply-templates select="key('resources', '&ac;Delete', document(ac:document-uri('&ac;')))" mode="ldh:logo">
+                        <xsl:with-param name="class" select="'btn' || (if ($delete-disabled) then ' disabled' else ())"/>
+                    </xsl:apply-templates>
+                    
+                    <xsl:apply-templates select="key('resources', '&ac;Delete', document(ac:document-uri('&ac;')))" mode="ac:label"/>
+                </button>
+            </div>
+            
+            <xsl:if test="$ldh:ajaxRendering">
+                <div class="pull-right">
+                    <button type="button" title="{ac:label(key('resources', 'save-as-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}">
+                        <xsl:apply-templates select="key('resources', 'save-as', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ldh:logo">
+                            <xsl:with-param name="class" select="'btn' || (if ($save-as-disabled) then ' disabled' else ())"/>
+                        </xsl:apply-templates>
+
+                        <xsl:value-of>
+                            <xsl:apply-templates select="key('resources', 'save-as', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
+                            <xsl:text>...</xsl:text>
+                        </xsl:value-of>
+                    </button>
+                </div>
+            
+                <div class="pull-right">
+                    <button type="button" title="{ac:label(key('resources', 'acl-list-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}">
+                        <xsl:apply-templates select="key('resources', '&acl;Access', document(ac:document-uri('&acl;')))" mode="ldh:logo">
+                            <xsl:with-param name="class" select="'btn'"/>
+                        </xsl:apply-templates>
+                        <xsl:apply-templates select="key('resources', '&acl;Access', document(ac:document-uri('&acl;')))" mode="ac:label"/>
+                    </button>
+                </div>
+
+                <div class="pull-right">
+                    <button type="button" class="btn btn-edit pull-right" title="{ac:label(key('resources', '&ac;EditMode', document(ac:document-uri('&ac;'))))}">
+                        <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ldh:logo">
+                            <xsl:with-param name="class" select="'btn' || (if ($edit-disabled) then ' disabled' else ())"/>
+                        </xsl:apply-templates>
+
+                        <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
+                    </button>
+                </div>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+    
     <!-- MODE LIST -->
 
     <xsl:template match="rdf:RDF[key('resources-by-type', '&http;Response')][not(key('resources-by-type', '&spin;ConstraintViolation'))] | rdf:RDF[key('resources-by-type', '&http;Response')][not(key('resources-by-type', '&sh;ValidationResult'))]" mode="bs2:ModeList" priority="1"/>
 
-    <xsl:template match="rdf:RDF" mode="bs2:ModeList" priority="2" use-when="system-property('xsl:product-name') = 'SAXON'">
+    <xsl:template match="rdf:RDF" mode="bs2:ModeList" priority="2">
         <xsl:param name="active-mode" as="xs:anyURI"/>
         <xsl:param name="ajax-rendering" select="true()" as="xs:boolean"/>
         <xsl:param name="absolute-path" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
         <xsl:param name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
-        <xsl:param name="id" select="'layout-modes'" as="xs:string?"/>
+        <xsl:param name="id" select="()" as="xs:string?"/>
 
         <div class="btn-group pull-right">
-            <button type="button" title="{ac:label(key('resources', '&ac;Mode', document(ac:document-uri('&ac;'))))}">
+            <button type="button" class="layout-modes" title="{ac:label(key('resources', '&ac;Mode', document(ac:document-uri('&ac;'))))}">
                 <xsl:if test="$id">
                     <xsl:attribute name="id" select="$id"/>
                 </xsl:if>
@@ -268,10 +353,10 @@ extension-element-prefixes="ixsl"
 
             <ul class="dropdown-menu">
                 <li class="content-mode{if ($active-mode = '&ldh;ContentMode') then ' active' else() }">
-                    <a href="{ldh:href(ac:document-uri(ldh:base-uri(.)), ldh:query-params(xs:anyURI('&ldh;ContentMode')))}">
+                    <a href="{ldh:href(ac:document-uri(ldh:base-uri(.)), ldh:build-query(xs:anyURI('&ldh;ContentMode')))}">
                         <xsl:apply-templates select="key('resources', '&ldh;ContentMode', document(ac:document-uri('&ldh;')))" mode="ldh:logo"/>
                         <xsl:value-of>
-                            <xsl:apply-templates select="key('resources', 'content', document('translations.rdf'))" mode="ac:label"/>
+                            <xsl:apply-templates select="key('resources', 'content', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ac:label"/>
                         </xsl:value-of>
                     </a>
                 </li>
@@ -296,7 +381,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="uri" as="xs:anyURI"/>
         
         <div class="btn-group pull-right">
-            <button type="button" id="export-rdf" title="{ac:label(key('resources', 'nav-bar-action-export-rdf-title', document('translations.rdf')))}">
+            <button type="button" id="export-rdf" title="{ac:label(key('resources', 'nav-bar-action-export-rdf-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri))))}">
                 <xsl:apply-templates select="key('resources', '&ac;Export', document(ac:document-uri('&ac;')))" mode="ldh:logo">
                     <xsl:with-param name="class" select="'btn dropdown-toggle'"/>
                 </xsl:apply-templates>
@@ -322,11 +407,34 @@ extension-element-prefixes="ixsl"
         </div>
     </xsl:template>
     
+    <!-- TAB BODY -->
+    
+    <xsl:template match="rdf:RDF" mode="bs2:TabBody">
+        <xsl:param name="id" select="'tab-pane-' || ac:uuid()" as="xs:string?"/>
+        <xsl:param name="class" select="'tab-pane active'" as="xs:string?"/>
+        <xsl:param name="mode" as="xs:anyURI"/>
+
+        <div class="">
+            <xsl:if test="$id">
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:if>
+            <xsl:if test="$class">
+                <xsl:attribute name="class" select="$class"/>
+            </xsl:if>
+
+            <xsl:apply-templates select="." mode="bs2:ActionBar">
+                <xsl:with-param name="active-mode" select="$mode"/>
+            </xsl:apply-templates>
+
+            <xsl:apply-templates select="." mode="bs2:ContentBody"/>
+        </div>
+    </xsl:template>
+    
     <!-- CONTENT BODY -->
 
-    <xsl:template match="rdf:RDF[exists($ldh:requestUri) and key('resources-by-type', '&http;Response') and not(key('resources-by-type', '&spin;ConstraintViolation')) and not(key('resources-by-type', '&sh;ValidationResult'))]" mode="bs2:ContentBody" priority="1">
-        <xsl:param name="id" select="'content-body'" as="xs:string?"/>
-        <xsl:param name="class" select="'container-fluid'" as="xs:string?"/>
+    <xsl:template match="rdf:RDF[key('resources-by-type', '&http;Response') and not(key('resources-by-type', '&spin;ConstraintViolation')) and not(key('resources-by-type', '&sh;ValidationResult'))]" mode="bs2:ContentBody" priority="1">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'container-fluid content-body'" as="xs:string?"/>
 
         <div>
             <xsl:if test="$id">
@@ -343,12 +451,32 @@ extension-element-prefixes="ixsl"
         </div>
     </xsl:template>
     
+    <xsl:template match="srx:sparql" mode="bs2:ContentBody">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'container-fluid content-body'" as="xs:string?"/>
+        <xsl:param name="about" as="xs:anyURI?"/>
+
+        <div>
+            <xsl:if test="$id">
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:if>
+            <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:apply-templates select="." mode="xhtml:Table"/>
+        </div>
+    </xsl:template>
+    
     <xsl:template match="rdf:RDF" mode="bs2:ContentBody">
-        <xsl:param name="id" select="'content-body'" as="xs:string?"/>
-        <xsl:param name="class" select="'container-fluid'" as="xs:string?"/>
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'container-fluid content-body'" as="xs:string?"/>
         <xsl:param name="about" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI?"/>
-        <xsl:param name="typeof" select="key('resources', ac:absolute-path(ldh:base-uri(.)))/rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
-        <xsl:param name="mode" as="xs:anyURI"/>
+        <xsl:param name="typeof" select="key('resources', $about)/rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
+        <xsl:param name="mode" select="ac:mode(root())" as="xs:anyURI"/>
 
         <div>
             <xsl:if test="$id">
@@ -394,13 +522,41 @@ extension-element-prefixes="ixsl"
         </div>
     </xsl:template>
 
+    <!-- ACTION BAR -->
+    
+    <xsl:template match="rdf:RDF | srx:sparql" mode="bs2:ActionBar">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'navbar-inner action-bar'" as="xs:string?"/>
+
+        <div>
+            <xsl:if test="$id">
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:if>
+            <xsl:if test="$class">
+                <xsl:attribute name="class" select="$class"/>
+            </xsl:if>
+
+            <div class="container-fluid">
+                <div class="row-fluid">
+                    <xsl:apply-templates select="." mode="bs2:ActionBarLeft"/>
+
+                    <xsl:apply-templates select="." mode="bs2:ActionBarMain"/>
+                    
+                    <xsl:apply-templates select="." mode="bs2:ActionBarRight">
+                        <xsl:with-param name="active-mode" select="ac:mode(root())"/>
+                    </xsl:apply-templates>
+                </div>
+            </div>
+        </div>
+    </xsl:template>
+
     <!-- CONTENT LIST -->
 
     <xsl:template match="rdf:RDF" mode="ldh:ContentList">
         <xsl:apply-templates select="key('resources', ac:absolute-path(ldh:base-uri(.)))" mode="#current"/>
         
         <!-- only show buttons to agents who have sufficient access to modify them -->
-        <xsl:if test="$acl:mode = '&acl;Append'">
+        <xsl:if test="acl:mode() = '&acl;Append'">
             <div class="create-resource row-fluid">
                 <div class="main offset2 span7">
                     <p>
@@ -429,7 +585,7 @@ extension-element-prefixes="ixsl"
             <xsl:sort select="ac:label(.)"/>
         </xsl:apply-templates>
         
-        <xsl:if test="$create-resource and $acl:mode = '&acl;Append' and not(key('resources-by-type', '&http;Response'))">
+        <xsl:if test="$create-resource and acl:mode() = '&acl;Append' and not(key('resources-by-type', '&http;Response'))">
             <div class="create-resource row-fluid">
                 <div class="main offset2 span7">
                     <xsl:apply-templates select="." mode="bs2:Create">
@@ -455,7 +611,7 @@ extension-element-prefixes="ixsl"
         </xsl:param>
         <xsl:param name="anchor-column" as="xs:boolean" select="true()" tunnel="yes"/>
         <xsl:param name="object-uris" select="rdf:Description/*/@rdf:resource[not(key('resources', .))]" as="xs:anyURI*"/>
-        <xsl:param name="object-metadata" select="if (exists($object-uris)) then ldh:send-request($sd:endpoint, 'POST', 'application/sparql-query', $object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }', map{ 'Accept': 'application/rdf+xml' }) else ()" as="document-node()?" tunnel="yes"/>
+        <xsl:param name="object-metadata" select="if (exists($object-uris)) then ldh:send-request(sd:endpoint(), 'POST', 'application/sparql-query', $object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }', map{ 'Accept': 'application/rdf+xml' }) else ()" as="document-node()?" tunnel="yes"/>
         
         <xsl:next-match>
             <xsl:with-param name="id" select="$id"/>
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 42b0bf1d8..ef8460dbd 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
@@ -13,6 +13,7 @@
     <!ENTITY srx    "http://www.w3.org/2005/sparql-results#">
     <!ENTITY http   "http://www.w3.org/2011/http#">
     <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
+    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
     <!ENTITY dh     "https://www.w3.org/ns/ldt/document-hierarchy#">
     <!ENTITY sh     "http://www.w3.org/ns/shacl#">
@@ -39,6 +40,7 @@ xmlns:xsd="&xsd;"
 xmlns:srx="&srx;"
 xmlns:http="&http;"
 xmlns:acl="&acl;"
+xmlns:sd="&sd;"
 xmlns:ldt="&ldt;"
 xmlns:sh="&sh;"
 xmlns:sp="&sp;"
@@ -74,11 +76,10 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="$acl:mode"/>
     </xsl:function>
 
-    <xsl:function name="ac:uri" as="xs:anyURI?" use-when="system-property('xsl:product-name') = 'SAXON'">
-        <xsl:sequence select="$ac:uri"/>
+    <xsl:function name="ac:uri" as="xs:anyURI?">
+        <xsl:sequence select="if (ldh:query-params()?uri) then xs:anyURI(ldh:query-params()?uri) else ()"/>
     </xsl:function>
 
-
     <!-- Strips the leftmost subdomain and returns parent dataspace origin (scheme + host + port) -->
     <xsl:function name="ldh:parent-origin" as="xs:anyURI?">
         <xsl:param name="uri" as="xs:anyURI"/>
@@ -108,12 +109,24 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="$ldh:requestUri"/>
     </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(), '?'))"/>
+    </xsl:function>
+    
     <xsl:function name="ldh:base-uri" as="xs:anyURI" use-when="system-property('xsl:product-name') = 'SAXON'">
         <xsl:param name="arg" as="node()"/>
         
         <xsl:sequence select="base-uri($arg)"/>
     </xsl:function>
       
+    <xsl:function name="ldt:base" as="xs:anyURI">
+        <xsl:sequence select="$ldt:base"/>
+    </xsl:function>
+
+    <xsl:function name="sd:endpoint" as="xs:anyURI">
+        <xsl:sequence select="resolve-uri('sparql', ldt:base())"/>
+    </xsl:function>    
+    
     <xsl:function name="ldh:href" as="xs:anyURI">
         <xsl:param name="uri" as="xs:anyURI?"/>
         
@@ -134,7 +147,7 @@ exclude-result-prefixes="#all"
         
         <xsl:choose>
             <!-- proxy URI - internal ones (relative to application's base URI) will be rewritten as absolute path in ApplicationFilter -->
-            <xsl:when test="$uri and not(starts-with($uri, $ldt:base))">
+            <xsl:when test="$uri and not(starts-with($uri, ldt:base()))">
                 <xsl:sequence select="xs:anyURI(ac:build-uri(ac:absolute-path(ldh:request-uri()), map:merge((map{ 'uri': string($uri) }, $query-params))) || (if ($fragment) then ('#' || $fragment) else ()))"/>
             </xsl:when>
             <!-- local URI -->
@@ -145,13 +158,13 @@ exclude-result-prefixes="#all"
         </xsl:choose>
     </xsl:function>
     
-    <xsl:function name="ldh:query-params" as="map(xs:string, xs:string*)">
+    <xsl:function name="ldh:build-query" as="map(xs:string, xs:string*)">
         <xsl:param name="mode" as="xs:anyURI*"/>
         
-        <xsl:sequence select="ldh:query-params($mode, ())"/>
+        <xsl:sequence select="ldh:build-query($mode, ())"/>
     </xsl:function>
 
-    <xsl:function name="ldh:query-params" as="map(xs:string, xs:string*)">
+    <xsl:function name="ldh:build-query" as="map(xs:string, xs:string*)">
         <xsl:param name="mode" as="xs:anyURI*"/>
         <xsl:param name="forClass" as="xs:anyURI?"/>
         
@@ -167,6 +180,24 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="document($request-uri)"/>
     </xsl:function>
 
+    <xsl:function name="ac:mode" as="xs:anyURI">
+        <xsl:param name="doc" as="document-node()"/>
+        <xsl:variable name="block-uris" select="key('resources', ac:absolute-path(ldh:base-uri($doc)), $doc)/rdf:*[starts-with(local-name(), '_')]/@rdf:resource" as="xs:anyURI*"/>
+        <xsl:variable name="has-content" select="exists($block-uris)" as="xs:boolean"/>
+        
+        <xsl:choose>
+            <xsl:when test="ldh:query-params()?mode">
+                <xsl:sequence select="xs:anyURI(ldh:query-params()?mode)"/>
+            </xsl:when>
+            <xsl:when test="$has-content">
+                <xsl:sequence select="xs:anyURI('&ldh;ContentMode')"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:sequence select="xs:anyURI('&ac;ReadMode')"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:function>
+    
     <!-- function stub so that Saxon-EE doesn't complain when compiling SEF -->
     <xsl:function name="ldh:construct" as="document-node()" override-extension-function="no" cache="yes">
         <xsl:param name="class-constructors" as="map(xs:anyURI, xs:string*)"/>
@@ -178,7 +209,7 @@ exclude-result-prefixes="#all"
     
     <xsl:function name="ldh:construct-forClass" as="document-node()" cache="yes">
         <xsl:param name="forClass" as="xs:anyURI+"/>
-        <xsl:variable name="results-uri" select="ac:build-uri(resolve-uri('ns', $ldt:base), map{ 'forClass': for $class in $forClass return string($class), 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
+        <xsl:variable name="results-uri" select="ac:build-uri(resolve-uri('ns', ldt:base()), map{ 'forClass': for $class in $forClass return string($class), 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
         <xsl:variable name="request-uri" select="ldh:href($results-uri, map{})" as="xs:anyURI"/>
             
         <xsl:sequence select="document($request-uri)"/>
@@ -503,7 +534,7 @@ 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="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="id" as="xs:string?"/>
         <xsl:param name="title" select="." as="xs:string?"/>
@@ -514,13 +545,13 @@ exclude-result-prefixes="#all"
             <xsl:with-param name="href" select="$href"/>
             <xsl:with-param name="id" select="$id"/>
             <xsl:with-param name="title" select="$title"/>
-            <xsl:with-param name="class" select="$class || (if (not(starts-with(., $ldt:base))) then ' external' else())"/>
+            <xsl:with-param name="class" select="$class || (if (not(starts-with(., ldt:base()))) then ' external' else())"/>
             <xsl:with-param name="target" select="$target"/>
         </xsl:next-match>
     </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="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="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"/>
@@ -533,7 +564,7 @@ exclude-result-prefixes="#all"
             <xsl:with-param name="id" select="$id"/>
             <xsl:with-param name="label" select="$label"/>
             <xsl:with-param name="title" select="$title"/>
-            <xsl:with-param name="class" select="$class || (if (not(starts-with(., $ldt:base))) then ' external' else())"/>
+            <xsl:with-param name="class" select="$class || (if (not(starts-with(., ldt:base()))) then ' external' else())"/>
             <xsl:with-param name="target" select="$target"/>
         </xsl:next-match>
     </xsl:template>
@@ -542,7 +573,7 @@ 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="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="id" as="xs:string?"/>
         <xsl:param name="title" select="." as="xs:string?"/>
@@ -553,7 +584,7 @@ exclude-result-prefixes="#all"
             <xsl:with-param name="href" select="$href"/>
             <xsl:with-param name="id" select="$id"/>
             <xsl:with-param name="title" select="$title"/>
-            <xsl:with-param name="class" select="$class || (if (not(starts-with(., $ldt:base))) then ' external' else())"/>
+            <xsl:with-param name="class" select="$class || (if (not(starts-with(., ldt:base()))) then ' external' else())"/>
             <xsl:with-param name="target" select="$target"/>
         </xsl:next-match>
     </xsl:template>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl
index 0eb27a8cb..77662bc3e 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl
@@ -30,7 +30,7 @@ exclude-result-prefixes="#all">
         <xsl:param name="id" select="generate-id()" as="xs:string"/>
         <xsl:param name="class" as="xs:string?"/>
         <xsl:param name="accept" as="xs:string?"/>
-        <xsl:param name="container" select="resolve-uri('uploads/', $ldt:base)" as="xs:anyURI"/> <!-- TO-DO: get container URI from the ns:ItemOfFileContainer restriction -->
+        <xsl:param name="container" select="resolve-uri('uploads/', ldt:base())" as="xs:anyURI"/> <!-- TO-DO: get container URI from the ns:ItemOfFileContainer restriction -->
         <xsl:param name="type-label" select="true()" as="xs:boolean"/>
 
         <xsl:call-template name="xhtml:Input">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/rdf.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/rdf.xsl
index c9b1cbb61..21a1734bc 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/rdf.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/rdf.xsl
@@ -104,7 +104,7 @@ exclude-result-prefixes="#all">
         <xsl:param name="id" select="generate-id()" as="xs:string"/>
         <xsl:param name="class" select="'subject input-xxlarge'" as="xs:string?"/>
         <xsl:param name="disabled" select="false()" as="xs:boolean"/>
-        <xsl:param name="auto" select="local-name() = 'nodeID' or starts-with(., $ldt:base)" as="xs:boolean"/>
+        <xsl:param name="auto" select="local-name() = 'nodeID' or starts-with(., ldt:base())" as="xs:boolean"/>
         <xsl:param name="type-metadata" as="document-node()?" tunnel="yes"/>
         <xsl:param name="lookup-class" select="'type-typeahead typeahead'" as="xs:string"/>
         <xsl:param name="lookup-list-class" select="'type-typeahead typeahead dropdown-menu'" 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 55993ef4f..fa6649b7c 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
@@ -102,9 +102,8 @@ exclude-result-prefixes="#all">
 
     <xsl:param name="lapp:origin" as="xs:anyURI?"/>
     <xsl:param name="ldh:requestUri" as="xs:anyURI"/>
-    <xsl:param name="ac:uri" as="xs:anyURI?"/>
-    <xsl:param name="ac:endpoint" select="if ($ldt:base) then resolve-uri('sparql', $ldt:base) else ()" as="xs:anyURI?"/>
-    <xsl:param name="sd:endpoint" as="xs:anyURI?"/>
+<!--    <xsl:param name="ac:endpoint" select="if ($ldt:base) then resolve-uri('sparql', $ldt:base) else ()" as="xs:anyURI?"/>
+    <xsl:param name="sd:endpoint" as="xs:anyURI?"/>-->
     <xsl:param name="acl:agent" as="xs:anyURI?"/>
     <xsl:param name="lapp:Context" as="document-node()"/>
     <xsl:param name="foaf:Agent" select="if ($acl:agent) then document(ac:document-uri($acl:agent)) else ()" as="document-node()?"/>
@@ -117,10 +116,6 @@ exclude-result-prefixes="#all">
     <xsl:param name="google:clientID" as="xs:string?"/>
     <xsl:param name="orcid:clientID" as="xs:string?"/>
     <xsl:param name="doc-types" select="key('resources', ac:absolute-path(ldh:base-uri(.)))/rdf:type/@rdf:resource[ . = ('&def;Root', '&dh;Container', '&dh;Item')]" as="xs:anyURI*"/>
-    <xsl:param name="block-uris" select="key('resources', ac:absolute-path(ldh:base-uri(.)))/rdf:*[starts-with(local-name(), '_')]/@rdf:resource" as="xs:anyURI*"/>
-    <!-- document has content when there are content sequence properties -->
-    <xsl:param name="has-content" select="exists($block-uris)" as="xs:boolean"/>
-    <xsl:param name="ac:mode" select="if ($has-content) then xs:anyURI('&ldh;ContentMode') else xs:anyURI('&ac;ReadMode')" as="xs:anyURI*"/>
     <xsl:param name="location-mapping" as="map(xs:anyURI, xs:anyURI)">
         <xsl:map>
             <xsl:map-entry key="resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)" select="resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)"/>
@@ -142,6 +137,9 @@ exclude-result-prefixes="#all">
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sd;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sd;'))), 'accept': 'application/rdf+xml' })"/>
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sh;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sh;'))), 'accept': 'application/rdf+xml' })"/>
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&nfo;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&nfo;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:if test="$acl:agent">
+                <xsl:map-entry key="ac:document-uri($acl:agent)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri($acl:agent)), 'accept': 'application/rdf+xml' })"/>
+            </xsl:if>
         </xsl:map>
     </xsl:param>
 
@@ -160,7 +158,7 @@ exclude-result-prefixes="#all">
               }
         ]]>
     </xsl:variable>
-    <xsl:variable name="app-request-uri" select="ac:build-uri(resolve-uri('sparql', $ldt:base), map{ 'query': $app-query })" as="xs:anyURI"/>
+    <xsl:variable name="app-request-uri" select="ac:build-uri(sd:endpoint(), map{ 'query': $app-query })" as="xs:anyURI"/>
     <xsl:variable name="forward-view-query" as="xs:string">
         <![CDATA[
             PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
@@ -362,14 +360,14 @@ exclude-result-prefixes="#all">
     <xsl:template match="rdf:RDF | srx:sparql" mode="xhtml:Script">
         <xsl:param name="client-stylesheet" select="resolve-uri('static/com/atomgraph/linkeddatahub/xsl/client.xsl.sef.json', $ac:contextUri)" as="xs:anyURI"/>
         <xsl:param name="saxon-js-log-level" select="10" as="xs:integer"/>
-        <xsl:param name="load-wymeditor" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-yasqe" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-saxon-js" select="$ldh:ajaxRendering and not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-sparql-builder" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-sparql-map" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-google-charts" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-xml-c14n" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
-        <xsl:param name="load-graph3d" select="not($ac:mode = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-wymeditor" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-yasqe" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-saxon-js" select="$ldh:ajaxRendering and not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-sparql-builder" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-sparql-map" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-google-charts" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-xml-c14n" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
+        <xsl:param name="load-graph3d" select="not(ac:mode(root()) = ('&ac;ModalMode', '&ldht;InfoWindowMode'))" as="xs:boolean"/>
         <xsl:param name="output-schema-org" select="true()" as="xs:boolean"/>
         <xsl:param name="location-mapping" select="$location-mapping" as="map(xs:anyURI, xs:anyURI)"/>
 
@@ -383,19 +381,9 @@ exclude-result-prefixes="#all">
             <xsl:text disable-output-escaping="yes">
               //&lt;![CDATA[
             </xsl:text>
-            <xsl:if test="$lapp:origin">
-                <![CDATA[
-                    var appUri = ]]><xsl:value-of select="'&quot;' || key('apps-by-origin', $lapp:origin, $lapp:Context)/@rdf:about || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
-                    var baseUri = ]]><xsl:value-of select="'&quot;' || $ldt:base || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
-                    var ontologyUri = ]]><xsl:value-of select="'&quot;' || $ldt:ontology || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
-                    var endpointUri = ]]><xsl:value-of select="if ($sd:endpoint) then '&quot;' || $sd:endpoint || '&quot;'  else 'null'" disable-output-escaping="yes"/><![CDATA[;
-                ]]>
-            </xsl:if>
             <![CDATA[
-                var absolutePath = ]]><xsl:value-of select="'&quot;' || ac:absolute-path(ldh:base-uri(.)) || '&quot;'" disable-output-escaping="yes"/><![CDATA[;
                 var contextUri = ]]><xsl:value-of select="if ($ac:contextUri) then '&quot;' || $ac:contextUri || '&quot;'  else 'null'" disable-output-escaping="yes"/><![CDATA[;
                 var agentUri = []]><xsl:value-of select="if ($acl:agent) then '&quot;' || $acl:agent || '&quot;'  else 'null'" disable-output-escaping="yes"/><![CDATA[];
-                var accessModeUri = []]><xsl:value-of select="string-join(for $mode in $acl:mode return '&quot;' || $mode || '&quot;', ', ')" disable-output-escaping="yes"/><![CDATA[];
             ]]>
             <xsl:text disable-output-escaping="yes">
               //]]&gt;
@@ -459,13 +447,7 @@ exclude-result-prefixes="#all">
                         const servicesRequestUri = "]]></xsl:text><xsl:value-of select="$app-request-uri"/><xsl:text disable-output-escaping="yes"><![CDATA[";
                         const stylesheetParams = {
                             "Q{https://w3id.org/atomgraph/client#}contextUri": contextUri, // servlet context URI
-                            "Q{https://w3id.org/atomgraph/linkeddatahub/apps#}application": appUri,
-                            "Q{https://www.w3.org/ns/ldt#}base": baseUri,
-                            "Q{https://www.w3.org/ns/ldt#}ontology": ontologyUri,
-                            "Q{http://www.w3.org/ns/sparql-service-description#}endpoint": endpointUri,
-                            "Q{https://w3id.org/atomgraph/linkeddatahub#}absolutePath": absolutePath,
                             "Q{http://www.w3.org/ns/auth/acl#}agent": agentUri,
-                            "Q{http://www.w3.org/ns/auth/acl#}mode": accessModeUri,
                             "Q{}app-request-uri": servicesRequestUri
                             };
                         
@@ -552,7 +534,7 @@ exclude-result-prefixes="#all">
                             <a class="brand context" href="{ldh:parent-origin($ldt:base)}"/>
                         </xsl:if>
                     </xsl:if>
-                        
+
                     <xsl:apply-templates select="." mode="bs2:Brand"/>
 
                     <div id="collapsing-top-navbar" class="nav-collapse collapse" style="margin-left: 17%;">
@@ -564,10 +546,6 @@ exclude-result-prefixes="#all">
                     </div>
                 </div>
             </div>
-
-            <xsl:apply-templates select="." mode="bs2:ActionBar">
-                <xsl:with-param name="id" select="'action-bar'"/>
-            </xsl:apply-templates>
         </div>
     </xsl:template>
 
@@ -599,11 +577,7 @@ exclude-result-prefixes="#all">
                     </option>
                 </select>
                 
-                <input type="text" id="uri" name="uri" class="input-xxlarge typeahead">
-                    <xsl:if test="$ac:uri">
-                        <xsl:attribute name="value" select="ldh:base-uri(.)"/>
-                    </xsl:if>
-                </input>
+                <input type="text" id="uri" name="uri" class="input-xxlarge typeahead"/>
                 <!-- placeholder used by the client-side typeahead -->
                  <ul id="ul-{generate-id()}" class="search-typeahead typeahead dropdown-menu" style="display: none"/> 
 
@@ -778,55 +752,34 @@ exclude-result-prefixes="#all">
             <div id="visible-body">
                 <xsl:apply-templates select="." mode="bs2:NavBar"/>
 
-                <xsl:choose>
-                    <!-- the request is proxied using ?uri, render it client-side in client.xsl -->
-                    <!-- ldh:rdf-document-response bypasses this branch by passing ac:uri=() as a local override -->
-                    <xsl:when test="$ac:uri">
-                        <div id="content-body" class="container-fluid">
+                <div id="tab-body">
+                    <!-- tab bar — sticky, hidden until first external tab is opened -->
+                    <div id="tab-bar" class="navbar-inner" style="display: none">
+                        <div class="container-fluid">
                             <div class="row-fluid">
-                                <div class="span12 progress progress-striped active">
-                                    <div style="width: 33%;" class="bar"></div>
-                                </div>
+                                <ul class="nav nav-tabs span12" id="tab-bar-list"/>
                             </div>
                         </div>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:apply-templates select="." mode="bs2:ContentBody">
-                            <xsl:with-param name="mode" select="$ac:mode"/>
+                    </div>
+
+                    <!-- document content panes using Bootstrap 2.3.2 tab-content/tab-pane classes -->
+                    <div id="tab-content" class="tab-content">
+                        <xsl:apply-templates select="." mode="bs2:TabBody">
+                            <xsl:with-param name="mode" select="ac:mode(root())"/>
                         </xsl:apply-templates>
-                    </xsl:otherwise>
-                </xsl:choose>
+                    </div>
+                </div>
 
                 <xsl:apply-templates select="." mode="bs2:Footer"/>
             </div>
-            
+
             <xsl:apply-templates select="." mode="bs2:DocumentTree"/>
         </body>
     </xsl:template>
     
-    <xsl:template match="srx:sparql" mode="bs2:ContentBody">
-        <xsl:param name="id" select="'content-body'" as="xs:string?"/>
-        <xsl:param name="class" select="'container-fluid'" as="xs:string?"/>
-        <xsl:param name="about" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI?"/>
-
-        <div>
-            <xsl:if test="$id">
-                <xsl:attribute name="id" select="$id"/>
-            </xsl:if>
-            <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:apply-templates select="." mode="xhtml:Table"/>
-        </div>
-    </xsl:template>
-    
     <!-- only lookup resource locally using DESCRIBE if it's external (not relative to the app's base URI) and the agent is authenticated -->
     <xsl:template match="*[*][@rdf:about = ac:absolute-path(ldh:base-uri(.))][not(starts-with(@rdf:about, $ldt:base))][$foaf:Agent//@rdf:about]" mode="bs2:PropertyList">
-        <xsl:param name="endpoint" select="($sd:endpoint, $ac:endpoint)[1]" as="xs:anyURI"/>
+        <xsl:param name="endpoint" select="sd:endpoint()" as="xs:anyURI"/>
         <xsl:param name="property-uris" select="distinct-values(*/concat(namespace-uri(), local-name()))" as="xs:anyURI*"/>
         <xsl:param name="property-metadata" select="ldh:send-request(resolve-uri('ns', $ldt:base), 'POST', 'application/sparql-query', 'DESCRIBE ' || string-join(for $uri in distinct-values(/rdf:RDF/*/*/concat(namespace-uri(), local-name())) return '&lt;' || $uri || '&gt;', ' '), map{ 'Accept': 'application/rdf+xml' })" as="document-node()"/>
         <xsl:variable name="local-doc" select="ldh:query-result($endpoint, 'DESCRIBE &lt;' || @rdf:about || '&gt;')" as="document-node()"/>
@@ -937,32 +890,6 @@ exclude-result-prefixes="#all">
             </div>
         </xsl:if>
     </xsl:template>
-    
-    <!-- ADD DATA -->
-    
-    <xsl:template match="rdf:RDF[$acl:mode = '&acl;Append']" mode="bs2:AddData" priority="1">
-        <div class="btn-group pull-left">
-            <button type="button" class="btn btn-primary dropdown-toggle" title="{ac:label(key('resources', 'add', document('translations.rdf')))}">
-                <xsl:value-of>
-                    <xsl:apply-templates select="key('resources', 'add', document('translations.rdf'))" mode="ac:label"/>
-                </xsl:value-of>
-                <xsl:text> </xsl:text>
-                <span class="caret"></span>
-            </button>
-            
-            <ul class="dropdown-menu">
-                <li>
-                    <button type="button" title="{ac:label(key('resources', 'generate-containers-title', document('translations.rdf')))}" class="btn btn-generate-containers">
-                        <xsl:value-of>
-                            <xsl:apply-templates select="key('resources', 'generate-containers', document('translations.rdf'))" mode="ac:label"/>
-                        </xsl:value-of>
-                    </button>
-                </li>
-            </ul>
-        </div>
-    </xsl:template>
-    
-    <xsl:template match="*" mode="bs2:AddData"/>
    
     <!-- HEADER  -->
 
@@ -1018,83 +945,7 @@ exclude-result-prefixes="#all">
     <!-- hide the header of def:SelectChildren content -->
     <xsl:template match="*[*][$ldh:ajaxRendering][rdf:value/@rdf:resource = '&ldh;SelectChildren']" mode="bs2:RowContentHeader"/>
     
-    <!-- ACTION BAR -->
-    
-    <xsl:template match="rdf:RDF | srx:sparql" mode="bs2:ActionBar">
-        <xsl:param name="id" as="xs:string?"/>
-        <xsl:param name="class" select="'navbar-inner action-bar'" as="xs:string?"/>
-        <xsl:param name="has-content" select="exists(key('resources', ac:absolute-path(ldh:base-uri(.)))/rdf:*[starts-with(local-name(), '_')]/@rdf:resource)" as="xs:boolean"/>
-
-        <div>
-            <xsl:if test="$id">
-                <xsl:attribute name="id" select="$id"/>
-            </xsl:if>
-            <xsl:if test="$class">
-                <xsl:attribute name="class" select="$class"/>
-            </xsl:if>
-
-            <div class="container-fluid">
-                <div class="row-fluid">
-                    <xsl:apply-templates select="." mode="bs2:ActionBarLeft"/>
-
-                    <xsl:apply-templates select="." mode="bs2:ActionBarMain"/>
-                    
-                    <xsl:apply-templates select="." mode="bs2:ActionBarRight">
-                        <xsl:with-param name="active-mode" select="($ac:mode, xs:anyURI(if ($has-content) then '&ldh;ContentMode' else '&ac;ReadMode'))[1]"/>
-                    </xsl:apply-templates>
-                </div>
-            </div>
-        </div>
-    </xsl:template>
-    
-    <!-- NAVBAR ACTIONS -->
-
-    <xsl:template match="rdf:RDF" mode="bs2:NavBarActions" priority="1">
-        <xsl:param name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
-        
-        <xsl:if test="$foaf:Agent//@rdf:about">
-            <div class="pull-right">
-                <button type="button" title="{ac:label(key('resources', 'nav-bar-action-delete-title', document('translations.rdf')))}">
-                    <xsl:apply-templates select="key('resources', '&ac;Delete', document(ac:document-uri('&ac;')))" mode="ldh:logo">
-                        <xsl:with-param name="class" select="'btn' || (if (not($acl:mode = '&acl;Write')) then ' disabled' else ())"/>
-                    </xsl:apply-templates>
-                    
-                    <xsl:apply-templates select="key('resources', '&ac;Delete', document(ac:document-uri('&ac;')))" mode="ac:label"/>
-                </button>
-            </div>
-            
-            <xsl:if test="$ldh:ajaxRendering">
-                <div class="pull-right">
-                    <button type="button" title="{ac:label(key('resources', 'save-as-title', document('translations.rdf')))}">
-                        <xsl:apply-templates select="key('resources', 'save-as', document('translations.rdf'))" mode="ldh:logo">
-                            <!-- disable button if external document is not being browsed or the agent has no acl:Write access -->
-                            <xsl:with-param name="class" select="'btn' || (if ((ac:absolute-path(ldh:base-uri(.)) = ac:absolute-path(ldh:request-uri())) or not($acl:mode = '&acl;Write')) then ' disabled' else ())"/>
-                        </xsl:apply-templates>
-
-                        <xsl:value-of>
-                            <xsl:apply-templates select="key('resources', 'save-as', document('translations.rdf'))" mode="ac:label"/>
-                            <xsl:text>...</xsl:text>
-                        </xsl:value-of>
-                    </button>
-                </div>
-            </xsl:if>
-            
-            <div class="btn-group pull-right">
-                <button type="button" title="{ac:label(key('resources', 'acl-list-title', document('translations.rdf')))}">
-                    <xsl:apply-templates select="key('resources', '&acl;Access', document(ac:document-uri('&acl;')))" mode="ldh:logo">
-                        <xsl:with-param name="class" select="'btn'"/>
-                    </xsl:apply-templates>
-                    <xsl:apply-templates select="key('resources', '&acl;Access', document(ac:document-uri('&acl;')))" mode="ac:label"/>
-                </button>
-            </div>
-            
-            <xsl:if test="$acl:mode = '&acl;Write'">
-                <button type="button" class="btn btn-edit pull-right">
-                    <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
-                </button>
-            </xsl:if>
-        </xsl:if>
-    </xsl:template>
+    <!-- ACCESS LIST ITEM -->
     
     <xsl:template match="*[@rdf:about]" mode="bs2:AccessListItem" priority="1">
         <xsl:param name="enabled" as="xs:anyURI*"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
index f810b7f68..bbe5c6241 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
@@ -62,8 +62,6 @@ exclude-result-prefixes="#all"
 extension-element-prefixes="ixsl"
 >
     
-    <xsl:param name="foaf:Agent" as="document-node()?"/>
-
     <xsl:key name="shapes-by-target-class" match="*[@rdf:about] | *[@rdf:nodeID]" use="sh:targetClass/@rdf:resource | sh:targetClass/@rdf:resource"/>
 
     <!-- LABEL -->
@@ -403,7 +401,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="absolute-path" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI" tunnel="yes"/>
         <xsl:param name="base-uri" as="xs:anyURI?"/>
         <xsl:param name="active" as="xs:boolean"/>
-        <xsl:param name="href" select="ldh:href(ac:document-uri($base-uri), ldh:query-params(xs:anyURI(@rdf:about)))" as="xs:anyURI?"/>
+        <xsl:param name="href" select="ldh:href(ac:document-uri($base-uri), ldh:build-query(xs:anyURI(@rdf:about)))" as="xs:anyURI?"/>
         <xsl:param name="mode-classes" as="map(xs:string, xs:string)">
             <xsl:map>
                 <xsl:map-entry key="'&ldh;ContentMode'" select="'content-mode'"/>
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 eddd638c5..acb4770ac 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -97,7 +97,7 @@ extension-element-prefixes="ixsl"
     <xsl:import href="converters/SPARQLXMLResults2DataTable.xsl"/>
     <xsl:import href="converters/RDFXML2GeoJSON.xsl"/>
     
-    <xsl:include href="bootstrap/2.3.2/admin/signup.xsl"/>
+<!--    <xsl:include href="bootstrap/2.3.2/admin/signup.xsl"/>-->
     <xsl:include href="bootstrap/2.3.2/client/query-transforms.xsl"/>
     <xsl:include href="bootstrap/2.3.2/client/typeahead.xsl"/>
     <xsl:include href="bootstrap/2.3.2/client/functions.xsl"/>
@@ -115,12 +115,10 @@ extension-element-prefixes="ixsl"
 
     <xsl:param name="ldh:ajaxRendering" select="true()" as="xs:boolean"/>
     <xsl:param name="ac:contextUri" as="xs:anyURI"/>
-    <xsl:param name="ldh:requestUri" select="xs:anyURI(ixsl:location())" as="xs:anyURI"/>
-    <xsl:param name="lapp:application" as="xs:anyURI?"/>
-    <xsl:param name="ldt:base" as="xs:anyURI?"/>
-    <xsl:param name="ldt:ontology" as="xs:anyURI?"/> <!-- used in default.xsl -->
+    <xsl:param name="ldt:base" as="xs:anyURI?"/> <!-- used in Web-Client TO-DO: remove -->
+    <xsl:param name="ldt:ontology" as="xs:anyURI?"/> <!-- used in Web-Client TO-DO: remove -->
     <xsl:param name="acl:agent" as="xs:anyURI?"/>
-    <xsl:param name="sd:endpoint" as="xs:anyURI?"/>
+    <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="app-request-uri" as="xs:anyURI"/>
     <xsl:param name="ldh:apps" as="document-node()">
         <xsl:document>
@@ -224,40 +222,6 @@ WHERE
         ]]>
         <!-- VALUES $this goes here -->
     </xsl:param>
-    <xsl:param name="system-containers" as="map(xs:anyURI, map(xs:string, xs:string))">
-        <xsl:map>
-            <xsl:map-entry key="resolve-uri('apps/', $ldt:base)">
-                <xsl:map>
-                    <xsl:map-entry key="'class'" select="'btn-app'"/>
-                    <xsl:map-entry key="'label-id'" select="'applications'"/>
-                </xsl:map>
-            </xsl:map-entry>
-            <xsl:map-entry key="resolve-uri('geo/', $ldt:base)">
-                <xsl:map>
-                    <xsl:map-entry key="'class'" select="'btn-geo'"/>
-                    <xsl:map-entry key="'label-id'" select="'geo'"/>
-                </xsl:map>
-            </xsl:map-entry>
-            <xsl:map-entry key="resolve-uri('imports/', $ldt:base)">
-                <xsl:map>
-                    <xsl:map-entry key="'class'" select="'btn-import'"/>
-                    <xsl:map-entry key="'label-id'" select="'imports'"/>
-                </xsl:map>
-            </xsl:map-entry>
-            <xsl:map-entry key="resolve-uri('latest/', $ldt:base)">
-                <xsl:map>
-                    <xsl:map-entry key="'class'" select="'btn-latest'"/>
-                    <xsl:map-entry key="'label-id'" select="'latest'"/>
-                </xsl:map>
-            </xsl:map-entry>
-            <xsl:map-entry key="resolve-uri('services/', $ldt:base)">
-                <xsl:map>
-                    <xsl:map-entry key="'class'" select="'btn-service'"/>
-                    <xsl:map-entry key="'label-id'" select="'services'"/>
-                </xsl:map>
-            </xsl:map-entry>
-        </xsl:map>
-    </xsl:param>
     <xsl:param name="body-id" select="'visible-body'" as="xs:string"/>
     
     <xsl:key name="resources" match="*[*][@rdf:about] | *[*][@rdf:nodeID]" use="@rdf:about | @rdf:nodeID"/>
@@ -272,21 +236,16 @@ WHERE
         <xsl:message>xsl:product-name: <xsl:value-of select="system-property('xsl:product-name')"/></xsl:message>
         <xsl:message>saxon:platform: <xsl:value-of select="system-property('saxon:platform')"/></xsl:message>
         <xsl:message>$ac:contextUri: <xsl:value-of select="$ac:contextUri"/></xsl:message>
-        <xsl:message>$ldt:base: <xsl:value-of select="$ldt:base"/></xsl:message>
         <xsl:message>$acl:agent: <xsl:value-of select="$acl:agent"/></xsl:message>
         <xsl:message>count($ldh:apps//*[rdf:type/@rdf:resource = '&sd;Service']): <xsl:value-of select="count($ldh:apps//*[rdf:type/@rdf:resource = '&sd;Service'])"/></xsl:message>
-        <xsl:message>$ac:lang: <xsl:value-of select="$ac:lang"/></xsl:message>
-        <xsl:message>$sd:endpoint: <xsl:value-of select="$sd:endpoint"/></xsl:message>
         <xsl:message>ac:uri(): <xsl:value-of select="ac:uri()"/></xsl:message>
         <xsl:message>UTC offset: <xsl:value-of select="implicit-timezone()"/></xsl:message>
 
         <!-- create a LinkedDataHub namespace -->
         <ixsl:set-property name="LinkedDataHub" select="ldh:new-object()"/>
-        <ixsl:set-property name="base" select="$ldt:base" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
         <ixsl:set-property name="contents" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
         <ixsl:set-property name="typeahead" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/> <!-- used by typeahead.xsl -->
         <ixsl:set-property name="graphs" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/> <!-- used by graph3d.xsl -->
-<!--        <ixsl:set-property name="endpoint" select="$sd:endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>-->
         <ixsl:set-property name="yasqe" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
 
         <!-- handle OAuth ID token from URL fragment -->
@@ -302,8 +261,8 @@ WHERE
             </xsl:when>
             <xsl:otherwise>
                 <xsl:apply-templates select="ixsl:page()" mode="ldh:HTMLDocumentLoaded">
-                    <xsl:with-param name="href" select="xs:anyURI(ixsl:location())"/>
-                    <xsl:with-param name="endpoint" select="$sd:endpoint"/>
+                    <xsl:with-param name="href" select="ldh:request-uri()"/>
+<!--                    <xsl:with-param name="endpoint" select="$sd:endpoint"/>-->
                     <xsl:with-param name="container" select="id($body-id, ixsl:page())"/>
                     <xsl:with-param name="replace-content" select="false()"/>
                 </xsl:apply-templates>
@@ -333,6 +292,12 @@ WHERE
                 <xsl:call-template name="ldh:NavigationUpdate">
                     <xsl:with-param name="href" select="base-uri(ixsl:page())"/>
                 </xsl:call-template>
+                <!-- if the URI is external, set it in the address bar -->
+                <xsl:if test="ac:uri()">
+                    <xsl:for-each select="id('uri', ixsl:page())">
+                        <ixsl:set-property name="value" select="ac:uri()" object="."/>
+                    </xsl:for-each>
+                </xsl:if>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -483,7 +448,25 @@ WHERE
     </xsl:template>
     
     <!-- CALLBACKS -->
-    
+
+    <xsl:template name="ldh:PopulateBreadcrumbNav">
+        <xsl:param name="container" as="element()"/>
+        <xsl:param name="response" as="map(*)"/>
+        <xsl:param name="uri" as="xs:anyURI"/>
+
+        <xsl:for-each select="$container">
+            <xsl:result-document href="?." method="ixsl:replace-content">
+                <ul class="breadcrumb pull-left"/>
+            </xsl:result-document>
+        </xsl:for-each>
+        <xsl:sequence select="ldh:breadcrumb-resource-response(map{
+            'response': $response,
+            'container': $container,
+            'uri': $uri,
+            'leaf': true()
+        })"/>
+    </xsl:template>
+
     <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(*)"/>
@@ -491,44 +474,9 @@ WHERE
         <xsl:variable name="refresh-content" select="$context('refresh-content')" as="xs:boolean?"/>
 
         <xsl:for-each select="$response">
-            <!-- load breadcrumbs -->
-            <xsl:if test="id('breadcrumb-nav', ixsl:page())">
-                <xsl:result-document href="#breadcrumb-nav" method="ixsl:replace-content">
-                    <!-- show label if the resource is external -->
-                    <xsl:if test="not(starts-with($uri, $ldt:base))">
-                        <xsl:variable name="app" select="ixsl:get(ixsl:window(), 'LinkedDataHub.apps')//rdf:Description[lapp:origin/@rdf:resource = lapp:origin(ldt:base())]" as="element()?"/>
-                        <xsl:choose>
-                            <!-- if a known app matches $uri, show link to its ldt:base -->
-                            <xsl:when test="$app">
-                                <a href="{$app/lapp:origin/@rdf:resource}" class="label label-info pull-left">
-                                    <xsl:apply-templates select="$app" mode="ac:label"/>
-                                </a>
-                            </xsl:when>
-                            <!-- otherwise show just a label with the hostname -->
-                            <xsl:otherwise>
-                                <xsl:variable name="hostname" select="tokenize(substring-after($uri, '://'), '/')[1]" as="xs:string"/>
-                                <span class="label label-info pull-left">
-                                    <xsl:value-of select="$hostname"/>
-                                </span>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:if>
-                    
-                    <ul class="breadcrumb pull-left">
-                        <!-- list items will be injected by ldh:breadcrumb-resource-response -->
-                    </ul>
-                </xsl:result-document>
-
-                <xsl:variable name="context" as="map(*)" select="
-                  map{
-                    'response': $response,
-                    'container': id('breadcrumb-nav', ixsl:page()),
-                    'uri': $uri,
-                    'leaf': true()
-                  }"/>
-                <xsl:sequence select="ldh:breadcrumb-resource-response($context)"/>
-            </xsl:if>
-        
+            <ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
+            
+            <xsl:message>ldh:rdf-document-response uri: <xsl:value-of select="$uri"/> status: <xsl:value-of select="?status"/></xsl:message>
             <!-- checking acl:mode here because this template is called after every document load (also the initial load) and has access to ?headers -->
             <!-- set LinkedDataHub.acl-modes objects which are later used by the acl:mode function -->
             <!-- doing it here because this template is called after every document load (also the initial load) and has access to ?headers -->
@@ -549,7 +497,6 @@ WHERE
             </xsl:if>
 
             <xsl:variable name="etag" select="?headers?etag" as="xs:string?"/>
-            <xsl:message>ETag: <xsl:value-of select="$etag"/></xsl:message>
 
             <xsl:choose>
                 <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
@@ -559,6 +506,9 @@ WHERE
                     <xsl:if test="$endpoint">
                         <ixsl:set-property name="endpoint" select="$endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
                     </xsl:if>
+                    <!-- store application URI from Link header -->
+                    <xsl:variable name="application-link" select="tokenize(?headers?link, ',')[contains(., '&lapp;application')]" as="xs:string?"/>
+                    <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')"/>
@@ -568,57 +518,42 @@ WHERE
                         <!-- 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 || '`')"/>
 
-                        <xsl:for-each select="id('content-body', ixsl:page())">
-                            <xsl:choose>
-                                <xsl:when test="not(starts-with($uri, $ldt:base))">
-                                    <!-- external ?uri= resource: replace content-body with resource description rendered client-side -->
-                                    <!-- detect ContentMode from rdf:_* sequence properties, same as layout.xsl does server-side;
-                                         explicit UI mode (ac:mode()) takes priority -->
-                                    <xsl:variable name="block-uris" select="$results/rdf:RDF/*[@rdf:about = $uri]/rdf:*[starts-with(local-name(), '_')]/@rdf:resource" as="xs:anyURI*"/>
-                                    <!-- explicit URL mode takes priority over ContentMode detection -->
-                                    <xsl:variable name="mode" select="(if (ixsl:query-params()?mode) then xs:anyURI(ixsl:query-params()?mode) else (), if (exists($block-uris)) then xs:anyURI('&ldh;ContentMode') else xs:anyURI('&ac;ReadMode'))[1]" as="xs:anyURI"/>
-                                    <!-- replace the content-body element entirely; pass ac:uri=() to bypass the proxy-rendering branch in bs2:ContentBody -->
-                                    <xsl:result-document href="?." method="ixsl:replace-element">
-                                        <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:ContentBody">
-                                            <xsl:with-param name="about" select="$uri"/>
-                                            <xsl:with-param name="typeof" select="$results/rdf:RDF/*[@rdf:about = $uri]/rdf:type/@rdf:resource/xs:anyURI(.)"/>
-                                            <xsl:with-param name="mode" select="$mode"/>
-                                        </xsl:apply-templates>
-                                    </xsl:result-document>
-                                    <!-- load top-level content blocks in the new content-body -->
-                                    <xsl:for-each select="id('content-body', ixsl:page())/div">
-                                        <xsl:variable name="factories" as="(function(item()?) as item()*)*">
-                                            <xsl:apply-templates select="." mode="ldh:RenderRow"/>
-                                        </xsl:variable>
-                                        <xsl:for-each select="$factories">
-                                            <xsl:variable name="factory" select="."/>
-                                            <ixsl:promise select="$factory(())" on-failure="ldh:promise-failure#1"/>
-                                        </xsl:for-each>
-                                    </xsl:for-each>
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <!-- this has to go after <xsl:result-document href="#{$container-id}"> because otherwise new elements will be injected and the lookup will not work anymore -->
-                                    <!-- load top-level content blocks -->
-                                    <xsl:for-each select="div">
-                                        <!-- container could be hidden server-side -->
-                                        <ixsl:set-style name="display" select="'block'"/>
-
-                                        <!-- one top-level <div> can contain multiple blocks that need to be rendered via factory -->
-                                        <xsl:variable name="factories" as="(function(item()?) as item()*)*">
-                                            <xsl:apply-templates select="." mode="ldh:RenderRow">
-                                                <xsl:with-param name="refresh-content" select="$refresh-content"/>
-                                            </xsl:apply-templates>
-                                        </xsl:variable>
-
-                                        <xsl:for-each select="$factories">
-                                            <xsl:variable name="factory" select="."/>
-                                            <!-- fire the promise chain once, passing a dummy start value -->
-                                            <ixsl:promise select="$factory(())" on-failure="ldh:promise-failure#1"/>
-                                        </xsl:for-each>
-                                    </xsl:for-each>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:for-each>
+                        <xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = $uri]" as="element()?"/>
+                        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>                        
+                        <xsl:variable name="tab-body" as="element()">
+                            <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:TabBody">
+                                <xsl:with-param name="mode" select="$mode"/>
+                            </xsl:apply-templates>
+                        </xsl:variable>
+
+                        <!-- no tab yet: create tab for the external document -->
+                        <xsl:if test="not(starts-with($uri, ldt:base())) and not($tab-pane)">
+                            <xsl:message>ldh:AddTabNavBarListItem</xsl:message>
+
+                            <xsl:call-template name="ldh:AddTabNavBarListItem">
+                                <xsl:with-param name="uri" select="$uri"/>
+                                <xsl:with-param name="label" select="ac:label(key('resources', $uri, $results))"/>
+                                <xsl:with-param name="endpoint" select="$endpoint"/>
+                                <xsl:with-param name="application" select="$application"/>
+                            </xsl:call-template>
+
+                            <xsl:variable name="local-tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = ac:absolute-path(ldh:request-uri())]" as="element()"/>
+                            <ixsl:set-style name="display" select="'none'" object="$local-tab-pane"/>
+
+                            <xsl:message>CREATE EXTERNAL TAB PANE</xsl:message>
+                            <!-- create external pane for this URI if it doesn't exist yet (scales to N panes, one per URI) -->
+                            <xsl:result-document href="#tab-content" method="ixsl:append-content">
+                                <xsl:sequence select="$tab-body"/>
+                            </xsl:result-document>
+                        </xsl:if>
+        
+                        <xsl:call-template name="ldh:RenderTab">
+                            <xsl:with-param name="tab-pane-id" select="if ($tab-pane) then $tab-pane/@id else $tab-body/@id"/>
+                            <xsl:with-param name="uri" select="$uri"/>
+                            <xsl:with-param name="mode" select="$mode"/>
+                            <xsl:with-param name="response" select="$response"/>
+                            <xsl:with-param name="refresh-content" select="$refresh-content"/>
+                        </xsl:call-template>
 
                         <!-- is a new instance of Service was created, reload the LinkedDataHub.apps data and re-render the service dropdown -->
                         <xsl:if test="//ldt:base or //sd:endpoint">
@@ -687,6 +622,117 @@ WHERE
         </xsl:for-each>
     </xsl:function>
 
+    <!-- TAB MANAGEMENT TEMPLATES -->
+
+    <!-- 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="label" as="xs:string"/>
+        <xsl:param name="endpoint" as="xs:anyURI?"/>
+        <xsl:param name="application" as="xs:anyURI?"/>
+
+        <xsl:message>ldh:AddTabNavBarListItem $uri: <xsl:value-of select="$uri"/></xsl:message>
+        
+        <!-- on the very first external tab, prepend a permanent local-document tab (no close button) -->
+        <xsl:if test="empty(id('tab-bar-list', ixsl:page())/li)">
+            <xsl:message>PREPEND LOCAL DOCUMENT TAB</xsl:message>
+
+            <xsl:result-document href="#tab-bar-list" method="ixsl:append-content">
+                <li data-uri="{ac:absolute-path(ldh:request-uri())}" data-endpoint="{resolve-uri('sparql', ldt:base())}">
+                    <xsl:if test="$application">
+                        <xsl:attribute name="data-application" select="$application"/>
+                    </xsl:if>
+
+                    <a href="{ac:absolute-path(ldh:request-uri())}">
+                        <xsl:value-of select="ixsl:get(ixsl:page(), 'title')"/>
+                    </a>
+                </li>
+            </xsl:result-document>
+        </xsl:if>
+
+        <!-- append the new tab <li> to the tab bar -->
+        <xsl:result-document href="#tab-bar-list" method="ixsl:append-content">
+            <xsl:message>APPEND NEW TAB TO TAB BAR</xsl:message>
+            <li data-uri="{$uri}">
+                <xsl:if test="$endpoint">
+                    <xsl:attribute name="data-endpoint" select="$endpoint"/>
+                </xsl:if>
+                <xsl:if test="$application">
+                    <xsl:attribute name="data-application" select="$application"/>
+                </xsl:if>
+                <a href="{ldh:href($uri)}" title="{$uri}">
+                    <xsl:value-of select="$label"/>
+                </a>
+<!--                <span class="tab-close">&#xd7;</span>-->
+            </li>
+        </xsl:result-document>
+
+        <!-- show the tab bar -->
+        <ixsl:set-style name="display" select="'block'" object="id('tab-bar', ixsl:page())"/>
+        <xsl:sequence select="ixsl:call(ixsl:get(ixsl:page(), 'documentElement.style'), 'setProperty', ['--action-bar-top', '99px'])[current-date() lt xs:date('2000-01-01')]"/>
+    </xsl:template>
+
+    <!-- activate an existing tab -->
+    <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="endpoint" select="xs:anyURI(ixsl:get(., 'dataset.endpoint'))" as="xs:anyURI"/>
+        <xsl:message>ldh:ActivateTab id: <xsl:value-of select="@id"/> dataset.uri: <xsl:value-of select="ixsl:get(., 'dataset.uri')"/> endpoint: <xsl:value-of select="$endpoint"/></xsl:message>
+
+        <!-- deactivate all tab <li>s -->
+        <xsl:for-each select="id('tab-bar-list', ixsl:page())/li">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'remove', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+        <!-- activate this tab <li> -->
+        <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'add', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+
+        <!-- deactivate all tab panes -->
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')]">
+            <ixsl:set-style name="display" select="'none'" object="."/>
+        </xsl:for-each>        
+        <!-- activate tab pane -->
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = $uri]">
+            <ixsl:set-style name="display" select="'block'" object="."/>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- render RDF results into a tab pane identified by @about = $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:contains(., 'dataset.uri')][ixsl:get(., 'dataset.uri') = $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 -->
+        <xsl:apply-templates select="$tab-list-item" mode="ldh:ActivateTab"/>
+        
+        <!-- fire factories for top-level content blocks in the rendered pane -->
+        <xsl:for-each select="id($tab-pane-id, ixsl:page())/div[contains-token(@class, 'content-body')]/div">
+            <xsl:variable name="factories" as="(function(item()?) as item()*)*">
+                <xsl:apply-templates select="." mode="ldh:RenderRow">
+                    <xsl:with-param name="refresh-content" select="$refresh-content"/>
+                </xsl:apply-templates>
+            </xsl:variable>
+            <xsl:for-each select="$factories">
+                <xsl:variable name="factory" select="."/>
+                <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="$uri"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+
     <xsl:template name="onServiceLoad">
         <xsl:context-item as="map(*)" use="required"/>
 
@@ -734,6 +780,7 @@ WHERE
         <!-- 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"/>
+        <xsl:message>ldh:RDFDocumentLoad uri: <xsl:value-of select="$uri"/> request-uri: <xsl:value-of select="$request-uri"/></xsl:message>
         <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{
@@ -785,15 +832,15 @@ WHERE
 
         <xsl:variable name="href" select="$context('href')" as="xs:anyURI?"/> <!-- absolute URI! -->
         <xsl:variable name="service-uri" select="if (id('search-service', ixsl:page())) then xs:anyURI(ixsl:get(id('search-service', ixsl:page()), 'value')) else ()" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
         <xsl:variable name="push-state" select="$context('push-state')" as="xs:boolean"/>
         <xsl:variable name="refresh-content" as="xs:boolean?"/>
         <xsl:variable name="response" select="$context('response')" as="map(*)"/>
 
         <!-- set #uri value -->
-        <xsl:for-each select="id('uri', ixsl:page())">
-            <ixsl:set-property name="value" select="if (not(starts-with($href, $ldt:base))) then $href else ()" object="."/>
-        </xsl:for-each>
+<!--        <xsl:for-each select="id('uri', ixsl:page())">
+            <ixsl:set-property name="value" select="if (not(starts-with($href, ldt:base()))) then $href else ()" object="."/>
+        </xsl:for-each>-->
         
         <xsl:for-each select="$response">
             <xsl:choose>
@@ -814,7 +861,7 @@ WHERE
 
                     <xsl:apply-templates select="?body" mode="ldh:HTMLDocumentLoaded">
                         <xsl:with-param name="href" select="$href"/>
-                        <xsl:with-param name="endpoint" select="$endpoint"/>
+<!--                        <xsl:with-param name="endpoint" select="$endpoint"/>-->
                         <xsl:with-param name="container" select="id($body-id, ixsl:page())"/>
                         <xsl:with-param name="push-state" select="$push-state"/>
                         <xsl:with-param name="refresh-content" select="$refresh-content"/>
@@ -843,7 +890,7 @@ WHERE
     
     <!-- cannot be a named template because overriding templates need to be able to call xsl:next-match (cannot use xsl:origin with Saxon-JS because of XSLT 3.0 packages) -->
     <xsl:template match="/" mode="ldh:HTMLDocumentLoaded">
-        <xsl:param name="href" select="ldh:base-uri(.)" as="xs:anyURI"/> <!-- possibly proxied URL -->
+        <xsl:param name="href" select="ldh:request-uri()" as="xs:anyURI"/> <!-- possibly proxied URL -->
         <xsl:param name="container" as="element()"/>
         <xsl:param name="push-state" select="true()" as="xs:boolean"/>
         <xsl:param name="endpoint" as="xs:anyURI?"/>
@@ -886,7 +933,8 @@ WHERE
 
         <xsl:if test="$push-state">
             <xsl:call-template name="ldh:PushState">
-                <xsl:with-param name="href" select="ldh:href($href, ldh:query-params(ac:mode()), $fragment)"/>
+<!--                <xsl:with-param name="href" select="ldh:href($href, ldh:build-query(ac:mode()), $fragment)"/>-->
+                <xsl:with-param name="href" select="$href"/>
                 <xsl:with-param name="title" select="/html/head/title"/>
                 <xsl:with-param name="container" select="$container"/>
             </xsl:call-template>
@@ -960,7 +1008,7 @@ WHERE
     
     <!-- intercept all HTML and SVG link clicks except to /uploads/ and those in the navbar (except breadcrumb bar, .brand and app list) and the footer -->
     <!-- 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[@id = '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: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="resolve-uri(@href, ldh:base-uri(.))" as="xs:anyURI"/> <!-- resolve relative URIs -->
         
@@ -1009,15 +1057,20 @@ WHERE
             <xsl:choose>
                 <!-- external URI: LDH no longer proxies HTML requests (ProxyRequestFilter), so fetching XHTML
                      would just return the same app shell already loaded. Skip that round-trip and load RDF directly. -->
-                <xsl:when test="not(starts-with($uri, $ldt:base))">
+                <xsl:when test="not(starts-with($uri, ldt:base()))">
+                    <!-- if the URI is external, set it in the address bar -->
+                    <xsl:if test="ac:uri()">
+                        <xsl:for-each select="id('uri', ixsl:page())">
+                            <ixsl:set-property name="value" select="ac:uri()" object="."/>
+                        </xsl:for-each>
+                    </xsl:if>
+                    
                     <xsl:call-template name="ldh:PushState">
                         <xsl:with-param name="href" select="$href"/>
                         <xsl:with-param name="title" select="()"/>
                         <xsl:with-param name="container" select="id($body-id, ixsl:page())"/>
                     </xsl:call-template>
-                    <xsl:for-each select="id('content-body', ixsl:page())//div[contains-token(@class, 'bar')]">
-                        <ixsl:set-style name="width" select="'66%'"/>
-                    </xsl:for-each>
+                    
                     <xsl:call-template name="ldh:RDFDocumentLoad">
                         <xsl:with-param name="uri" select="$uri"/>
                     </xsl:call-template>
@@ -1175,8 +1228,8 @@ WHERE
                 <xsl:variable name="query-json" select="ixsl:call(ixsl:get(ixsl:window(), 'JSON'), 'parse', [ $query-json-string ])"/>
                 <xsl:variable name="query-string" select="ixsl:call(ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromQuery', [ $query-json ]), 'toString', [])" as="xs:string"/>
                 <xsl:variable name="service-uri" select="xs:anyURI(ixsl:get(id('search-service'), 'value'))" as="xs:anyURI?"/>
-                <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
-                <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), resolve-uri('sparql', $ldt:base))[1]" as="xs:anyURI"/>
+                <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ldh:href(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }, ()))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
+                <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), resolve-uri('sparql', ldt:base()))[1]" as="xs:anyURI"/>
                 <xsl:variable name="results-uri" select="ac:build-uri($endpoint, map{ 'query': string($query-string) })" as="xs:anyURI"/>
                 <xsl:variable name="request-uri" select="ldh:href($results-uri, map{})" as="xs:anyURI"/>
                 
@@ -1275,108 +1328,166 @@ 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:variable name="textarea-id" select="'query-string'" as="xs:string"/>
-        <xsl:variable name="query" select="if (id($textarea-id, ixsl:page())) then ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.yasqe'), $textarea-id), 'getValue', []) else ()" as="xs:string?"/>
-        <xsl:variable name="service-uri" select="if (id('query-service', ixsl:page())) then xs:anyURI(ixsl:get(id('query-service'), 'value')) else ()" as="xs:anyURI?"/>
-        <xsl:variable name="service" select="if ($service-uri) then key('resources', $service-uri, document(ac:build-uri(ac:document-uri($service-uri), map{ 'accept': 'application/rdf+xml' }))) else ()" as="element()?"/> <!-- TO-DO: refactor asynchronously -->
-        <xsl:variable name="endpoint" select="($service/sd:endpoint/@rdf:resource/xs:anyURI(.), resolve-uri('sparql', $ldt:base))[1]" as="xs:anyURI"/>
-        <xsl:variable name="results-uri" select="if ($query) then ac:build-uri($endpoint, map{ 'query': $query }) else ()" as="xs:anyURI?"/>
-        
-        <!-- if SPARQL editor is shown, use the SPARQL protocol URI; otherwise use the Linked Data resource URI -->
-        <xsl:variable name="uri" select="if ($results-uri) then $results-uri else ldh:base-uri(.)" as="xs:anyURI"/>
-
-        <xsl:call-template name="ldh:ShowAddDataForm">
+       <xsl:call-template name="ldh:ShowAddDataForm">
             <xsl:with-param name="form" as="element()">
                 <xsl:call-template name="ldh:AddDataForm">
-                    <xsl:with-param name="source" select="$uri"/>
+                    <xsl:with-param name="source" select="ldh:base-uri(.)"/> <!-- the arg should really be the RDF/XML document-node() -->
                 </xsl:call-template>
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
     
-    <!-- document mode tabs -->
-    
-    <xsl:template match="div[@id = 'content-body']/div/ul[contains-token(@class, 'nav-tabs')]/li[not(contains-token(@class, 'active'))]/a" mode="ixsl:onclick">
+    <!-- tab bar: click on a tab link to activate it -->
+    <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="active-class" select="tokenize(../@class, ' ')[not(. = 'active')]" as="xs:string"/>
-        <xsl:variable name="href" select="@href" as="xs:anyURI"/>
-
-        <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
-        <!-- make other tabs inactive -->
-        <xsl:sequence select="../../li[not(contains-token(@class, $active-class))]/ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
-        <!-- make this tab active -->
-        <xsl:sequence select="../ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', true() ])[current-date() lt xs:date('2000-01-01')]"/>
+        <xsl:variable name="uri" select="xs:anyURI(ixsl:get(.., 'dataset.uri'))" as="xs:anyURI"/>
+        <xsl:message>tab click uri: <xsl:value-of select="$uri"/> href: <xsl:value-of select="ldh:href($uri)"/></xsl:message>
+        
+        <xsl:apply-templates select=".." mode="ldh:ActivateTab"/>
+        
+        <xsl:call-template name="ldh:PushState">
+            <xsl:with-param name="href" select="ldh:href($uri)"/>
+            <xsl:with-param name="title" select="()"/>
+            <xsl:with-param name="container" select=".."/>
+        </xsl:call-template>
+        <xsl:call-template name="ldh:RDFDocumentLoad">
+            <xsl:with-param name="uri" select="$uri"/>
+        </xsl:call-template>
+    </xsl:template>
 
-        <xsl:if test="ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub'), 'saxonController')">
-            <xsl:message>Aborting HTTP request that has already been sent</xsl:message>
-            <xsl:sequence select="ixsl:call(ixsl:get(ixsl:window(), 'LinkedDataHub.saxonController'), 'abort', [])"/>
+    <!-- tab bar: click the × close button to remove a tab -->
+    <!-- clicking the permanent local-document tab switches to #content-body -->
+<!--    <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:message>local tab click</xsl:message>
+         deactivate all tab <li>s 
+        <xsl:for-each select="id('tab-bar-list', ixsl:page())/li">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'remove', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+         activate local tab <li> 
+        <xsl:sequence select="ixsl:call(ixsl:get(id('tab-local', ixsl:page()), 'classList'), 'add', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+         deactivate the external pane 
+        <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'content-body') and not(@id)]">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'remove', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+         activate #content-body 
+        <xsl:for-each select="id('content-body', ixsl:page())">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'add', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+         reset endpoint so sd:endpoint() falls back to local 
+        <ixsl:remove-property name="endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
+         push state: strip ?uri= from URL so ldh:base-uri() returns the local URI during rendering 
+        <xsl:variable name="local-uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:call-template name="ldh:PushState">
+            <xsl:with-param name="href" select="ldh:href($local-uri)"/>
+            <xsl:with-param name="title" select="()"/>
+            <xsl:with-param name="container" select="id('content-body', ixsl:page())"/>
+        </xsl:call-template>
+         load local document RDF if not yet cached (happens when page was loaded with ?uri=) 
+        <xsl:if test="not(ixsl:contains(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $local-uri || '`'))">
+            <xsl:call-template name="ldh:RDFDocumentLoad">
+                <xsl:with-param name="uri" select="$local-uri"/>
+            </xsl:call-template>
         </xsl:if>
-        <xsl:variable name="controller" select="ixsl:abort-controller()"/>
-        <ixsl:set-property name="saxonController" select="$controller" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
-        
-        <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $href, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
-        <xsl:variable name="context" select="
-          map{
-            'request': $request,
-            'href': $href,
-            'push-state': true()
-          }" as="map(*)"/>
-        <ixsl:promise select="
-          ixsl:http-request($context('request'), $controller)
-            => ixsl:then(ldh:rethread-response($context, ?))
-            => ixsl:then(ldh:handle-response#1)
-            => ixsl:then(ldh:xhtml-document-loaded#1)
-        " on-failure="ldh:promise-failure#1"/>
+    </xsl:template>-->
+
+    <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="ixsl:get($tab-li, 'dataset.uri')" as="xs:string"/>
+        <xsl:variable name="was-active" select="contains-token($tab-li/@class, 'active')" as="xs:boolean"/>
+
+        <!-- remove the tab <li> from the DOM -->
+        <xsl:sequence select="ixsl:call($tab-li, 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
+
+        <!-- remaining external tabs only (excludes the permanent local tab) -->
+        <xsl:variable name="remaining-external" select="id('tab-bar-list', ixsl:page())/li[not(@id = 'tab-local')]" as="element()*"/>
+        <xsl:choose>
+            <xsl:when test="empty($remaining-external)">
+                <!-- no external tabs left: remove external pane, local tab, hide tab bar -->
+                <xsl:for-each select="id('tab-content', ixsl:page())/div[contains-token(@class, 'content-body') and not(@id)]">
+                    <xsl:sequence select="ixsl:call(., 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
+                </xsl:for-each>
+                <xsl:for-each select="id('tab-local', ixsl:page())">
+                    <xsl:sequence select="ixsl:call(., 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
+                </xsl:for-each>
+                <ixsl:set-style name="display" select="'none'" object="id('tab-bar', ixsl:page())"/>
+                <xsl:sequence select="ixsl:call(ixsl:get(ixsl:page(), 'documentElement.style'), 'setProperty', ['--action-bar-top', '55px'])[current-date() lt xs:date('2000-01-01')]"/>
+                <!-- activate #content-body and reset endpoint -->
+                <xsl:for-each select="id('content-body', ixsl:page())">
+                    <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'add', ['active'])[current-date() lt xs:date('2000-01-01')]"/>
+                </xsl:for-each>
+                <ixsl:remove-property name="endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
+            </xsl:when>
+            <xsl:when test="$was-active">
+                <xsl:apply-templates select="$remaining-external[last()]" mode="ldh:ActivateTab"/>
+                
+                <xsl:call-template name="ldh:RDFDocumentLoad">
+                    <xsl:with-param name="uri" select="xs:anyURI(ixsl:get($remaining-external[last()], 'dataset.uri'))"/>
+                </xsl:call-template>
+            </xsl:when>
+        </xsl:choose>
     </xsl:template>
 
     <!-- file drop -->
 
-    <xsl:template match="div[ac:mode() = '&ac;ReadMode'][acl:mode() = '&acl;Write']" mode="ixsl:ondragover">
-        <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+    <xsl:template match="div[acl:mode() = '&acl;Write']" mode="ixsl:ondragover">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
+        
+        <xsl:if test="$mode = xs:anyURI('&ac;ReadMode')">
+            <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+        </xsl:if>
     </xsl:template>
 
-    <xsl:template match="div[ac:mode() = '&ac;ReadMode'][acl:mode() = '&acl;Write']" mode="ixsl:ondrop">
-        <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
-        <xsl:variable name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
-        <xsl:variable name="rdf-media-types" as="map(xs:string, xs:string)">
-            <xsl:map>
-                <xsl:map-entry key="'nt'" select="'application/n-triples'"/>
-                <xsl:map-entry key="'ttl'" select="'text/turtle'"/>
-                <xsl:map-entry key="'rdf'" select="'application/rdf+xml'"/>
-                <xsl:map-entry key="'owl'" select="'application/rdf+xml'"/>
-                <xsl:map-entry key="'jsonld'" select="'application/ld+json'"/>
-            </xsl:map>
-        </xsl:variable>
+    <xsl:template match="div[acl:mode() = '&acl;Write']" mode="ixsl:ondrop">
+        <xsl:variable name="uri" select="ac:absolute-path(ldh:request-uri())" as="xs:anyURI"/>
+        <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
+        <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
         
-        <xsl:if test="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'files.length') gt 0">
-            <xsl:message>
-                <xsl:variable name="files" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'files')"/>
-                <xsl:for-each select="0 to xs:integer(ixsl:get($files, 'length')) - 1">
-                    <xsl:variable name="file" select="map:get($files, .)"/>
-                    <xsl:variable name="file-ext" select="replace(ixsl:get($file, 'name'), '.*\.', '')" as="xs:string?"/>
-                    <xsl:variable name="file-type" select="if (ixsl:contains($file, 'type')) then ixsl:get($file, 'type') else ()" as="xs:string?"/>
-
-                    <xsl:choose>
-                        <!-- file extension is a map key or media type is a map value -->
-                        <xsl:when test="map:contains($rdf-media-types, $file-ext) or $file-type = $rdf-media-types?*">
-                            <!-- attempt to infer RDF media type from file extension first, fallback to file type -->
-                            <xsl:variable name="media-type" select="if (map:contains($rdf-media-types, $file-ext)) then map:get($rdf-media-types, $file-ext) else $file-type" as="xs:string"/>
-                            <xsl:message>Importing RDF file. Name: '<xsl:value-of select="ixsl:get($file, 'name')"/>' Media type: '<xsl:value-of select="$media-type"/>'</xsl:message>
-                            
-                            <xsl:variable name="headers" select="ldh:new-object()"/>
-                            <ixsl:set-property name="Content-Type" select="$media-type" object="$headers"/>
-                            <ixsl:set-property name="Accept" select="'application/rdf+xml'" object="$headers"/>
-
-                            <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
-
-                            <xsl:sequence select="js:fetchDispatchXML($base-uri, 'POST', $headers, $file, ., (), (), (), 'RDFFileUpload')[current-date() lt xs:date('2000-01-01')]"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ 'The file extension or media type is not a supported RDF triple syntax' ])[current-date() lt xs:date('2000-01-01')]"/>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:for-each>
-            </xsl:message>
+        <xsl:if test="$mode = xs:anyURI('&ac;ReadMode')">
+            <xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
+            <xsl:variable name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
+            <xsl:variable name="rdf-media-types" as="map(xs:string, xs:string)">
+                <xsl:map>
+                    <xsl:map-entry key="'nt'" select="'application/n-triples'"/>
+                    <xsl:map-entry key="'ttl'" select="'text/turtle'"/>
+                    <xsl:map-entry key="'rdf'" select="'application/rdf+xml'"/>
+                    <xsl:map-entry key="'owl'" select="'application/rdf+xml'"/>
+                    <xsl:map-entry key="'jsonld'" select="'application/ld+json'"/>
+                </xsl:map>
+            </xsl:variable>
+
+            <xsl:if test="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'files.length') gt 0">
+                <xsl:message>
+                    <xsl:variable name="files" select="ixsl:get(ixsl:get(ixsl:event(), 'dataTransfer'), 'files')"/>
+                    <xsl:for-each select="0 to xs:integer(ixsl:get($files, 'length')) - 1">
+                        <xsl:variable name="file" select="map:get($files, .)"/>
+                        <xsl:variable name="file-ext" select="replace(ixsl:get($file, 'name'), '.*\.', '')" as="xs:string?"/>
+                        <xsl:variable name="file-type" select="if (ixsl:contains($file, 'type')) then ixsl:get($file, 'type') else ()" as="xs:string?"/>
+
+                        <xsl:choose>
+                            <!-- file extension is a map key or media type is a map value -->
+                            <xsl:when test="map:contains($rdf-media-types, $file-ext) or $file-type = $rdf-media-types?*">
+                                <!-- attempt to infer RDF media type from file extension first, fallback to file type -->
+                                <xsl:variable name="media-type" select="if (map:contains($rdf-media-types, $file-ext)) then map:get($rdf-media-types, $file-ext) else $file-type" as="xs:string"/>
+                                <xsl:message>Importing RDF file. Name: '<xsl:value-of select="ixsl:get($file, 'name')"/>' Media type: '<xsl:value-of select="$media-type"/>'</xsl:message>
+
+                                <xsl:variable name="headers" select="ldh:new-object()"/>
+                                <ixsl:set-property name="Content-Type" select="$media-type" object="$headers"/>
+                                <ixsl:set-property name="Accept" select="'application/rdf+xml'" object="$headers"/>
+
+                                <ixsl:set-style name="cursor" select="'progress'" object="ixsl:page()//body"/>
+
+                                <xsl:sequence select="js:fetchDispatchXML($base-uri, 'POST', $headers, $file, ., (), (), (), 'RDFFileUpload')[current-date() lt xs:date('2000-01-01')]"/>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:sequence select="ixsl:call(ixsl:window(), 'alert', [ 'The file extension or media type is not a supported RDF triple syntax' ])[current-date() lt xs:date('2000-01-01')]"/>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </xsl:for-each>
+                </xsl:message>
+            </xsl:if>
         </xsl:if>
     </xsl:template>
 
@@ -1397,7 +1508,7 @@ WHERE
                 <ixsl:set-property name="saxonController" select="$controller" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
                 
                 <!-- retain the current layout mode (which should be ac:ReadMode -->
-                <xsl:variable name="href" select="ldh:href(ldh:base-uri(.), ldh:query-params(ac:mode()))" as="xs:anyURI"/>
+                <xsl:variable name="href" select="ldh:href(ldh:base-uri(.), ldh:build-query(ac:mode(.)))" as="xs:anyURI"/>
                 <xsl:variable name="request" select="map{ 'method': 'GET', 'href': $href, 'headers': map{ 'Accept': 'application/xhtml+xml' } }" as="map(*)"/>
                 <xsl:variable name="context" select="
                   map{
diff --git a/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java b/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java
index a55e8bf29..703bd9d7d 100644
--- a/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java
+++ b/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java
@@ -17,145 +17,95 @@
 package com.atomgraph.linkeddatahub.server.filter.request;
 
 import com.atomgraph.client.MediaTypes;
-import com.atomgraph.client.util.DataManager;
 import com.atomgraph.client.vocabulary.AC;
-import com.atomgraph.linkeddatahub.server.security.AgentContext;
-import org.apache.jena.ontology.Ontology;
-import com.atomgraph.linkeddatahub.server.util.URLValidator;
-import com.atomgraph.linkeddatahub.vocabulary.LAPP;
-import jakarta.ws.rs.NotAllowedException;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.Invocation;
-import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.NotAcceptableException;
 import jakarta.ws.rs.container.ContainerRequestContext;
 import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.Request;
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.UriInfo;
 import jakarta.ws.rs.core.Variant;
 import java.io.IOException;
 import java.net.URI;
+import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Resource;
+import java.util.Locale;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.when;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.*;
 
 /**
  * Unit tests for {@link ProxyRequestFilter}.
  *
  * @author Martynas Jusevičius {@literal <martynas@atomgraph.com>}
  */
-@RunWith(MockitoJUnitRunner.Silent.class)
+@RunWith(MockitoJUnitRunner.class)
 public class ProxyRequestFilterTest
 {
 
-    @Mock com.atomgraph.linkeddatahub.Application system;
-    @Mock MediaTypes mediaTypes;
-    @Mock Request request;
-    @Mock Variant selectedVariant;
-    @Mock Ontology ontology;
-
-    @InjectMocks ProxyRequestFilter filter;
+    @Mock private ContainerRequestContext requestContext;
+    @Mock private Request request;
+    @Mock private com.atomgraph.linkeddatahub.Application system;
 
-    @Mock ContainerRequestContext requestContext;
-    @Mock UriInfo uriInfo;
-    @Mock DataManager dataManager;
-    @Mock URLValidator urlValidator;
-    @Mock Client externalClient;
-    @Mock WebTarget webTarget;
-    @Mock Invocation.Builder invocationBuilder;
-    @Mock Response clientResponse;
-    @Mock Resource registeredApp;
-
-    private static final URI ADMIN_URI = URI.create("https://admin.localhost:4443/");
-    private static final URI EXTERNAL_URI = URI.create("https://example.com/data");
+    private ProxyRequestFilter filter;
 
     @Before
     public void setUp()
     {
-        when(requestContext.getUriInfo()).thenReturn(uriInfo);
-        when(requestContext.getProperty(LAPP.Application.getURI())).thenReturn(null);
-        when(requestContext.getProperty(LAPP.Dataset.getURI())).thenReturn(null);
-        when(system.getDataManager()).thenReturn(dataManager);
-        when(dataManager.isMapped(anyString())).thenReturn(false);
-        when(system.isEnableLinkedDataProxy()).thenReturn(false);
-        when(request.selectVariant(any())).thenReturn(selectedVariant);
-        filter.ontology = () -> Optional.empty();
+        filter = new ProxyRequestFilter();
+        filter.mediaTypes = new MediaTypes();
+        filter.request = request;
+        filter.system = system;
+        when(system.getSupportedLanguages()).thenReturn(Collections.emptyList());
     }
 
-    /**
-     * When the client explicitly accepts (X)HTML, the filter must bypass proxying entirely and let
-     * the downstream handler serve the app shell — regardless of the target URI.
-     */
+    /** No proxy properties set — filter must be a no-op. */
     @Test
-    public void testHtmlAcceptBypassesProxy() throws IOException
+    public void testNonProxyRequestSkipsFilter() throws IOException
     {
-        when(requestContext.getProperty(AC.uri.getURI())).thenReturn(EXTERNAL_URI);
-        when(requestContext.getAcceptableMediaTypes()).thenReturn(List.of(MediaType.TEXT_HTML_TYPE));
-
         filter.filter(requestContext);
-
-        verify(requestContext, never()).abortWith(any(Response.class));
+        verify(request, never()).selectVariant(anyList());
+        verify(requestContext, never()).abortWith(any());
     }
 
-    /**
-     * When the proxy is disabled, a {@code ?uri=} pointing to an unregistered external URL must be blocked.
-     */
-    @Test(expected = NotAllowedException.class)
-    public void testUnregisteredUriBlockedWhenProxyDisabled() throws IOException
+    /** Client explicitly accepts text/html — filter must return early (app shell). */
+    @Test
+    public void testHtmlAcceptReturnsEarly() throws IOException
     {
-        when(requestContext.getProperty(AC.uri.getURI())).thenReturn(EXTERNAL_URI);
-
+        when(requestContext.getProperty(AC.uri.getURI()))
+            .thenReturn(URI.create("http://example.org/resource"));
+        when(requestContext.getAcceptableMediaTypes())
+            .thenReturn(List.of(MediaType.TEXT_HTML_TYPE));
         filter.filter(requestContext);
+        verify(request, never()).selectVariant(anyList());
+        verify(requestContext, never()).abortWith(any());
     }
 
-    /**
-     * When the proxy is disabled, a {@code ?uri=} pointing to a registered {@code lapp:Application}
-     * must be allowed through — it is a first-party endpoint, not a third-party resource.
-     */
+    /** Client explicitly accepts application/xhtml+xml — filter must return early (app shell). */
     @Test
-    public void testRegisteredAppAllowedWhenProxyDisabled() throws IOException
+    public void testXhtmlAcceptReturnsEarly() throws IOException
     {
-        when(requestContext.getProperty(AC.uri.getURI())).thenReturn(ADMIN_URI);
-
-        // matchApp() returns a non-null Resource for the admin app (registered lapp:Application)
-        when(system.matchApp(ADMIN_URI)).thenReturn(registeredApp);
-
-        // SSRF validator is a no-op (mock void method)
-        when(system.getURLValidator()).thenReturn(urlValidator);
-
-        // HTTP call chain: GET to the admin app
-        when(system.getExternalClient()).thenReturn(externalClient);
-        when(requestContext.getMethod()).thenReturn("GET");
-        when(requestContext.getProperty(AgentContext.class.getCanonicalName())).thenReturn(null);
-        when(mediaTypes.getReadable(Model.class)).thenReturn(List.of());
-        when(mediaTypes.getReadable(ResultSet.class)).thenReturn(List.of());
-        when(externalClient.target(ADMIN_URI)).thenReturn(webTarget);
-        when(webTarget.request()).thenReturn(invocationBuilder);
-        when(invocationBuilder.accept(any(MediaType[].class))).thenReturn(invocationBuilder);
-        when(invocationBuilder.header(anyString(), any())).thenReturn(invocationBuilder);
-        when(invocationBuilder.method(anyString())).thenReturn(clientResponse);
-
-        // null media type triggers the early-return path in getResponse(Response)
-        when(clientResponse.getHeaders()).thenReturn(new MultivaluedHashMap<>());
-        when(clientResponse.getMediaType()).thenReturn(null);
-        when(clientResponse.getStatus()).thenReturn(200);
+        when(requestContext.getProperty(AC.uri.getURI()))
+            .thenReturn(URI.create("http://example.org/resource"));
+        when(requestContext.getAcceptableMediaTypes())
+            .thenReturn(List.of(MediaType.APPLICATION_XHTML_XML_TYPE));
+        filter.filter(requestContext);
+        verify(request, never()).selectVariant(anyList());
+        verify(requestContext, never()).abortWith(any());
+    }
 
-        filter.filter(requestContext); // must not throw NotAllowedException
+    /** No acceptable RDF/SPARQL variant — filter must throw 406. */
+    @Test(expected = NotAcceptableException.class)
+    public void testNullVariantThrowsNotAcceptable() throws IOException
+    {
+        when(requestContext.getProperty(AC.uri.getURI()))
+            .thenReturn(URI.create("http://example.org/resource"));
+        when(requestContext.getAcceptableMediaTypes())
+            .thenReturn(List.of(MediaType.WILDCARD_TYPE));
+        when(request.selectVariant(anyList())).thenReturn(null);
+        filter.filter(requestContext);
     }
 
 }