diff --git a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.ihtml b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.ihtml
index a89a4b099fb..59bb447acba 100644
--- a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.ihtml
+++ b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.ihtml
@@ -76,7 +76,7 @@
             <td class="ListColLeft resizeTitle"><a
                     href="{$elemArr[elem].RowMenu_link}">{$elemArr[elem].RowMenu_alias}</a></td>
             <td class="ListColCenter">{$elemArr[elem].RowMenu_retry}</td>
-            <td class="ListColRight">{$elemArr[elem].RowMenu_parent}</td>
+            <td class="ListColLeft">{$elemArr[elem].RowMenu_parent}</td>
             <td class="ListColCenter"><span
                     class="badge {$elemArr[elem].RowMenu_badge}">{$elemArr[elem].RowMenu_status}</span></td>
             <td class="ListColRight" align="right">{if $mode_access == 'w' }{$elemArr[elem].RowMenu_options}{else}&nbsp;{/if}</td>
diff --git a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
index 8467ce4dc8d..b611b5d96c5 100644
--- a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
+++ b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
@@ -172,7 +172,8 @@
         foreach ($tplArr as $key => $value) {
             $value = str_replace('#S#', "/", $value);
             $value = str_replace('#BS#', "\\", $value);
-            $tplStr .= "&nbsp;->&nbsp;<a href='main.php?p=60206&o=c&service_id=" . $key . "'>" . $value . "</a>";
+            $tplStr .= "&nbsp;->&nbsp;<a href='main.php?p=60206&o=c&service_id=" . $key . "'>"
+            . htmlentities($value) . "</a>";
         }
     }
 
@@ -228,7 +229,7 @@
         "RowMenu_select" => $selectedElements->toHtml(),
         "RowMenu_desc" => htmlentities($service["service_description"]),
         "RowMenu_alias" => htmlentities($service["service_alias"]),
-        "RowMenu_parent" => htmlentities($tplStr),
+        "RowMenu_parent" => $tplStr,
         "RowMenu_icon" => $svc_icon,
         "RowMenu_retry" => htmlentities(
             "$normal_check_interval $normal_units / $retry_check_interval $retry_units"