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 1dd10988b..026c28f16 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
@@ -496,6 +496,7 @@ exclude-result-prefixes="#all"
         <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="base-uri" select="base-uri()" as="xs:anyURI"/>
 
         <xsl:choose>
             <xsl:when test="not($type = 'hidden')">
@@ -527,7 +528,7 @@ exclude-result-prefixes="#all"
                                 -->
                                 <!-- hidden inputs in which we store the old values of the visible input -->
                                 <input type="hidden" class="old su">
-                                    <xsl:attribute name="value" select="if (local-name() = 'about') then . else resolve-uri(concat('/', ac:uuid()), base-uri())"/>
+                                    <xsl:attribute name="value" select="if (local-name() = 'about') then . else resolve-uri(concat('/', ac:uuid()), $base-uri)"/>
                                 </input>
                                 <input type="hidden" class="old sb">
                                     <xsl:attribute name="value" select="if (local-name() = 'nodeID') then . else generate-id()"/>
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 e1601468c..bd11798e6 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
@@ -1185,17 +1185,15 @@ extension-element-prefixes="ixsl"
                 <xsl:with-param name="shapes" select="$shapes"/>
                 <xsl:with-param name="traversed-ids" select="$traversed-ids" tunnel="yes"/>
                 <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
+                <xsl:with-param name="base-uri" select="base-uri()"/> <!-- make sure main doc's base URI is used and not the template's (which is empty) -->
             </xsl:apply-templates>
 
-            <!-- do not show property controls if there is no constructor or it has no properties -->
-<!--            <xsl:if test="$template/*">-->
-                <xsl:apply-templates select="." mode="bs2:PropertyControl">
-                    <xsl:with-param name="template" select="$template"/>
-                    <xsl:with-param name="forClass" select="$forClass"/>
-                    <xsl:with-param name="required" select="true()"/>
-                    <xsl:with-param name="property-metadata" select="$property-metadata"/>
-                </xsl:apply-templates>
-            <!--</xsl:if>-->
+            <xsl:apply-templates select="." mode="bs2:PropertyControl">
+                <xsl:with-param name="template" select="$template"/>
+                <xsl:with-param name="forClass" select="$forClass"/>
+                <xsl:with-param name="required" select="true()"/>
+                <xsl:with-param name="property-metadata" select="$property-metadata"/>
+            </xsl:apply-templates>
         </fieldset>
     </xsl:template>