diff --git a/public_html/deployment/classes/config-replacement.class.php b/public_html/deployment/classes/config-replacement.class.php
index 02fa1bc1478632e804503305d8f7f61671722857..5415757c16d5b8a3c6ab164bdba47f0087177d62 100644
--- a/public_html/deployment/classes/config-replacement.class.php
+++ b/public_html/deployment/classes/config-replacement.class.php
@@ -64,7 +64,7 @@ class configreplacement {
      * @return array
      */
     public function getReplacements($sPhase=false){
-        $aFiles=$this->getTemplatefiles();
+        $aFiles=$this->getTemplatefiles($sPhase);
         if (!$aFiles){
             return false;
         }
@@ -74,8 +74,7 @@ class configreplacement {
             // $sFile always exists because it was read from filesystem
             $sContent=file_get_contents($sFile);
 
-            preg_match_all('/replace\[[\'\"](.*)[\'\"]\]/U', $sContent, $aMatches);
-            // echo '<strong>'.$sFile.'</strong><br>'.print_r($aMatches, 1).'<br>'.$sContent.'<br><br>';
+            preg_match_all('/\@replace\[[\'\"](.*)[\'\"]\]/U', $sContent, $aMatches);
             $aReturn[$sFile]=$aMatches[1];
        }
         return $aReturn;
diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index c5be0e3e3fedbe1a42e211171a2813c835dee6a3..adf62697cc5086d3460ad5520f053e52ee3db9b3 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -2801,17 +2801,11 @@ class project extends base {
             $sRowHead2.='<td></td>' . $this->renderPlacesAsTd($sPhase);
         }
 
-        // echo "<pre>" . print_r($aAllVersions, true) . "</pre>";
-
         foreach ($aAllVersions as $sVersion => $aData) {
             $sReturn.='<tr>';
 
-            // $aFiles=$this->_getBuildfilesByVersion($sVersion);
             $sInfos = $this->renderInfoLink($aData["info"], array('hpos' => 'left'));
-            $sReturn.='<td>' 
-                    . $sVersion . ' ' . $sInfos . '<br>'
-                    // . $aFiles['filecount'] . ' ('.$aFiles['totalsize-hr'].')' 
-                    . '</td>';
+            $sReturn.='<td>' . $sVersion . ' ' . $sInfos . '</td>';
 
             foreach ($this->getActivePhases() as $sPhase) {
                 $sTLine = '';
@@ -3292,8 +3286,12 @@ class project extends base {
                 'type' => 'markup',
                 'value' => '<div style="clear: both; height: 2em;"></div>'
                     . '<div class="form-group">'
-                    . '<a class="expandable closed" href="#" '. ($aReplacements ? 'onclick="$(\'#'.$sDivIdReplacement.'\').slideToggle(); $(this).toggleClass(\'closed\'); return false;"' : '' )
-                    . '><h3>'.t("replacements").'  ('.($aReplacements ? count($aReplacements):0).')</h3></a>'
+                    . ($aReplacements 
+                        ? '<a class="expandable closed" href="#" onclick="$(\'#'.$sDivIdReplacement.'\').slideToggle(); $(this).toggleClass(\'closed\'); return false;">'
+                        : '' 
+                    )
+                    . '<h3>'.t("replacements").'  ('.($aReplacements ? count($aReplacements):0).')</h3>'
+                    . ($aReplacements ? '</a>' : '')
                     . t('replacements-info')
                     . '</div>'
             );