diff --git a/APPL/Shared/default.xsl b/APPL/Shared/default.xsl
index b7742cf233..d26625e184 100644
--- a/APPL/Shared/default.xsl
+++ b/APPL/Shared/default.xsl
@@ -3141,106 +3141,12 @@ END:VCALENDAR
   </xsl:template>
 
   <xsl:template match="rapport">
-    <xsl:choose>
-        <xsl:when test="@view='cnd_v_rap_conditiemetingen' or @view='CND_V_RAP_CONDITIEMETINGEN'">
-          <html>
-            <head>
-              <style>
-                th {
-                   white-space: nowrap;
-                }
-
-                .nobr {
-                   white-space: nowrap;
-                }
-              </style>
-            </head>
-            <body>
-              <xsl:choose>
-              <xsl:when test="count(rapport_data/data_row)=0">
-                <tr><td class="tekst"><center><br/><b>Geen gegevens gevonden</b></center></td></tr>
-              </xsl:when>
-              <xsl:otherwise>
-                <table width="100%">
-                  <thead>
-                    <tr>
-                        <th>Complex/Cluster</th>
-                        <th>Recept</th>
-                        <th>Gebrek</th>
-                        <th>Datum<br/>
-                        Inspecteur<br/>
-                        Status</th>
-                        <th>Ernst<br/>
-                        Omvang<br/>
-                        Intensiteit</th>
-                        <th>Aspecten</th>
-                        <th>Foto</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <xsl:for-each select="rapport_data/data_row">
-                      <tr>
-                        <td class="tekst"><xsl:value-of select="COMPLEXNUMMER"/><br/>
-                        <xsl:value-of select="CLUSTERNUMMER"/>&#xA0;
-                        <strong><xsl:value-of select="CLUSTERNAAM"/></strong></td>
-                        <td class="tekst nobr"><xsl:value-of select="HOOFDRECEPT"/><br/>
-                        <xsl:value-of select="GROEPRECEPT"/><br/>
-                        <xsl:value-of select="SUBRECEPT"/></td>
-                        <td class="tekst">
-                          <xsl:attribute name="onclick">FcltMgr.openDetail('appl/mld/mld_melding.asp?mld_key=<xsl:value-of select="MELDINGNUMMER"/>', '');</xsl:attribute>
-							            <xsl:value-of select="GEBREK"/>&#xA;(<span style="cursor:pointer; text-decoration: underline;"><xsl:value-of select="MELDINGNUMMER"/></span>)</td>
-                        <td class="tekst nobr"><xsl:value-of select="DATUM"/><br/>
-                        <xsl:value-of select="INSPECTEUR"/><br/>
-                        <xsl:value-of select="STATUS"/></td>
-                        <td class="tekst nobr"><xsl:value-of select="ERNST"/><br/>
-                        <xsl:value-of select="OMVANG"/><br/>
-                        <xsl:value-of select="INTENSITEIT"/></td>
-                        <td class="tekst">
-                        <xsl:if test="VEILIGHEID_GEZONDHEID!='NVT'">
-                        Veiligheid/gezondheid: <xsl:value-of select="VEILIGHEID_GEZONDHEID"/><br/>
-                        </xsl:if>
-                        <xsl:if test="CULTUURHISTORISCHE_WAARDE!='NVT'">
-                        Cultuurhistorische waarde: <xsl:value-of select="CULTUURHISTORISCHE_WAARDE"/><br/>
-                        </xsl:if>
-                        <xsl:if test="GEBRUIK_EN_BEDRIJFSPROCES!='NVT'">
-                        Gebruik en bedrijfsproces: <xsl:value-of select="GEBRUIK_EN_BEDRIJFSPROCES"/><br/>
-                        </xsl:if>
-                        <xsl:if test="TECHNISCHE_VERVOLGSCHADE!='NVT'">
-                        Technische vervolgschade: <xsl:value-of select="TECHNISCHE_VERVOLGSCHADE"/><br/>
-                        </xsl:if>
-                        <xsl:if test="TOENAME_KLACHTENONDERHOUD!='NVT'">
-                        Toename klachtenonderhoud: <xsl:value-of select="TOENAME_KLACHTENONDERHOUD"/><br/>
-                        </xsl:if>
-                        <xsl:if test="BELEVING_ESTHETICA!='NVT'">
-                        Beleving esthetica: <xsl:value-of select="BELEVING_ESTHETICA"/>
-                        </xsl:if>
-                        </td>
-                        <td>
-                        <div style="width: 300px;">
-                          <xsl:element name="img">
-                            <xsl:attribute name="frc">M=MLD:N=M:S=<xsl:value-of select="FOTO"/>:K=<xsl:value-of select="MLD_MELDING_KEY"/></xsl:attribute>
-                            <xsl:attribute name="style">max-width: 100%;display:block;border:3px solid white</xsl:attribute>
-                          </xsl:element>
-                        </div>
-                        </td>
-                      </tr>
-                    </xsl:for-each>
-                  </tbody>
-                </table>
-              </xsl:otherwise>
-              </xsl:choose>
-            </body>
-          </html>
-        </xsl:when>
-        <xsl:otherwise>
-        	 <xsl:apply-templates select="." mode="default"/>
-        </xsl:otherwise>
-    </xsl:choose>
+   	 <xsl:apply-templates select="." mode="default"/>
   </xsl:template>
 
   <xsl:template match="sysrapport">
-
     <xsl:choose>
+
         <xsl:when test="substring(@view,1,29)='ctr_v_monthly_recurring_tasks'"><!-- dutch only -->
           <html>
             <head>
@@ -3588,9 +3494,102 @@ END:VCALENDAR
             </body>
           </html>
 		    </xsl:when>
+
+        <xsl:when test="@view='cnd_v_rap_conditiemetingen' or @view='CND_V_RAP_CONDITIEMETINGEN'">
+          <html>
+            <head>
+              <style>
+                th {
+                   white-space: nowrap;
+                }
+
+                .nobr {
+                   white-space: nowrap;
+                }
+              </style>
+            </head>
+            <body>
+              <xsl:choose>
+              <xsl:when test="count(rapport_data/data_row)=0">
+                <tr><td class="tekst"><center><br/><b>Geen gegevens gevonden</b></center></td></tr>
+              </xsl:when>
+              <xsl:otherwise>
+                <table width="100%">
+                  <thead>
+                    <tr>
+                        <th><xsl:value-of select="//lcl/FAC/locatie"/></th>
+                        <th>Recept</th>
+                        <th>Gebrek</th>
+                        <th>Datum<br/>
+                        Inspecteur<br/>
+                        Status</th>
+                        <th>Ernst<br/>
+                        Omvang<br/>
+                        Intensiteit</th>
+                        <th>Aspecten</th>
+                        <th>Foto</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <xsl:for-each select="rapport_data/data_row">
+                      <tr>
+                        <td class="tekst"><xsl:value-of select="COMPLEXNUMMER"/><br/>
+                        <xsl:value-of select="CLUSTERNUMMER"/>&#xA0;
+                        <strong><xsl:value-of select="CLUSTERNAAM"/></strong></td>
+                        <td class="tekst nobr"><xsl:value-of select="HOOFDRECEPT"/><br/>
+                        <xsl:value-of select="GROEPRECEPT"/><br/>
+                        <xsl:value-of select="SUBRECEPT"/></td>
+                        <td class="tekst">
+                          <xsl:attribute name="onclick">FcltMgr.openDetail('appl/mld/mld_melding.asp?mld_key=<xsl:value-of select="MELDINGNUMMER"/>', '');</xsl:attribute>
+							            <xsl:value-of select="GEBREK"/>&#xA;(<span style="cursor:pointer; text-decoration: underline;"><xsl:value-of select="MELDINGNUMMER"/></span>)</td>
+                        <td class="tekst nobr"><xsl:value-of select="DATUM"/><br/>
+                        <xsl:value-of select="INSPECTEUR"/><br/>
+                        <xsl:value-of select="STATUS"/></td>
+                        <td class="tekst nobr"><xsl:value-of select="ERNST"/><br/>
+                        <xsl:value-of select="OMVANG"/><br/>
+                        <xsl:value-of select="INTENSITEIT"/></td>
+                        <td class="tekst">
+                        <xsl:if test="VEILIGHEID_GEZONDHEID!='NVT'">
+                        Veiligheid/gezondheid: <xsl:value-of select="VEILIGHEID_GEZONDHEID"/><br/>
+                        </xsl:if>
+                        <xsl:if test="CULTUURHISTORISCHE_WAARDE!='NVT'">
+                        Cultuurhistorische waarde: <xsl:value-of select="CULTUURHISTORISCHE_WAARDE"/><br/>
+                        </xsl:if>
+                        <xsl:if test="GEBRUIK_EN_BEDRIJFSPROCES!='NVT'">
+                        Gebruik en bedrijfsproces: <xsl:value-of select="GEBRUIK_EN_BEDRIJFSPROCES"/><br/>
+                        </xsl:if>
+                        <xsl:if test="TECHNISCHE_VERVOLGSCHADE!='NVT'">
+                        Technische vervolgschade: <xsl:value-of select="TECHNISCHE_VERVOLGSCHADE"/><br/>
+                        </xsl:if>
+                        <xsl:if test="TOENAME_KLACHTENONDERHOUD!='NVT'">
+                        Toename klachtenonderhoud: <xsl:value-of select="TOENAME_KLACHTENONDERHOUD"/><br/>
+                        </xsl:if>
+                        <xsl:if test="BELEVING_ESTHETICA!='NVT'">
+                        Beleving esthetica: <xsl:value-of select="BELEVING_ESTHETICA"/>
+                        </xsl:if>
+                        </td>
+                        <td>
+                        <div style="width: 300px;">
+                          <xsl:element name="img">
+                            <xsl:attribute name="frc">M=MLD:N=M:S=<xsl:value-of select="FOTO"/>:K=<xsl:value-of select="MLD_MELDING_KEY"/></xsl:attribute>
+                            <xsl:attribute name="style">max-width: 100%;display:block;border:3px solid white</xsl:attribute>
+                          </xsl:element>
+                        </div>
+                        </td>
+                      </tr>
+                    </xsl:for-each>
+                  </tbody>
+                </table>
+              </xsl:otherwise>
+              </xsl:choose>
+            </body>
+          </html>
+        </xsl:when>
+
         <xsl:otherwise>
         	 <xsl:apply-templates select="." mode="default"/>
         </xsl:otherwise>
+
     </xsl:choose>
   </xsl:template>
 
