diff --git a/src/core/xsl/query.xsl b/src/core/xsl/query.xsl
index 1a1bdf2e3d3a5319e138dc2c2e21cd4fd6729732..2b647c07bebe7f7cd72198baf27e45318e25a18e 100644
--- a/src/core/xsl/query.xsl
+++ b/src/core/xsl/query.xsl
@@ -248,15 +248,17 @@
           <xsl:with-param name="value">
             <xsl:value-of select="@*[translate(name(), $uppercase, $lowercase)=$first-segment]"/>
           </xsl:with-param>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="translate($first-segment, $uppercase, $lowercase)='version'">
         <!--handle version-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="Version/@id"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="Version/@id"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
@@ -268,9 +270,9 @@
       <xsl:when test="translate($next-segments, $uppercase, $lowercase)='unit'">
         <!--handle unit-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="@unit"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="@unit"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
@@ -305,24 +307,24 @@
           <xsl:with-param name="value">
             <xsl:value-of select="@*[translate(name(), $uppercase, $lowercase)=$first-segment]"/>
           </xsl:with-param>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="translate($first-segment, $uppercase, $lowercase)='version'">
         <!--handle version-->
         <xsl:call-template name="single-value">
-          <xsl:with-param name="value">
-            <xsl:value-of select="Version/@id"/>
-          </xsl:with-param>
+          <xsl:with-param name="value" select="Version/@id"/>
+          <xsl:with-param name="reference" select="'false'"/>
+          <xsl:with-param name="boolean" select="'false'"/>
         </xsl:call-template>
       </xsl:when>
 
       <xsl:when test="$next-segments">
         <!-- when there is a next-segmenst -->
         <xsl:apply-templates select="Property[translate(@name, $uppercase, $lowercase)=$first-segment]" mode="walk-select-segments">
-          <xsl:with-param name="next-segments">
-            <xsl:value-of select="$next-segments"/>
-          </xsl:with-param>
+          <xsl:with-param name="next-segments" select="$next-segments"/>
         </xsl:apply-templates>
       </xsl:when>