diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
index 5b59a1fbe..d6fa7e4a8 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/content.xsl
@@ -660,7 +660,7 @@ exclude-result-prefixes="#all"
                             <rdf:Description rdf:about="{$query-uri}">
                                 <rdf:type rdf:resource="&sp;Query"/>
                                 <rdf:type rdf:resource="{$forClass}"/>
-                                <dct:title><xsl:value-of select="$query-title"/></dct:title>
+                                <dct:title><xsl:value-of select="$title-input/ixsl:get(., 'value')"/></dct:title>
                                 <sp:text rdf:datatype="&xsd;string"><xsl:value-of select="$query-string"/></sp:text>
                                 
                                 <xsl:if test="$service-uri">
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 6d4eacaa5..9dc76d341 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
@@ -637,17 +637,6 @@ LIMIT   100
     <xsl:template match="rdf:RDF | srx:sparql" 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('translations.rdf'))" mode="ac:label"/>
-                        </xsl:value-of>
-                    </a>
-                </li>
                 <xsl:if test="doc-available($app-request-uri)">
                     <li>
                         <div class="btn-group">