diff --git a/core/ormstopwatch.class.inc.php b/core/ormstopwatch.class.inc.php
index e926f6246..6160b7dc2 100644
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -130,6 +130,10 @@ class ormStopWatch
 			{
 				$bRet = true;
 			}
+			if (isset($aThresholdData['overrun']) && ($aThresholdData['overrun'] > 0))
+			{
+				$bRet = true;
+			}
 		}
 		return $bRet;
 	}
@@ -160,6 +164,7 @@ class ormStopWatch
 			$aDefs = $this->aThresholds[$iPercent];
 			if (array_key_exists('highlight', $aDefs) && is_array($aDefs['highlight']) && $this->IsThresholdPassed($iPercent))
 			{
+				// If persistant or SW running...
 				if (($aDefs['highlight']['persistent'] == true) || (($aDefs['highlight']['persistent'] == false) && !is_null($this->iLastStart)))
 				{
 					$sCode = $aDefs['highlight']['code'];
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
index c9fd0c55e..c361aba13 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -251,7 +251,7 @@
         </field>
         <field id="sla_tto_passed" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_tto_over" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
@@ -263,7 +263,7 @@
         </field>
         <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_ttr_over" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
index c7fd04298..76f95220c 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -262,7 +262,7 @@
         </field>
         <field id="sla_tto_passed" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_tto_over" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
@@ -274,7 +274,7 @@
         </field>
         <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_ttr_over" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>
diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
index cf62c3af0..0c6e14649 100755
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -283,7 +283,7 @@
         </field>
         <field id="sla_tto_passed" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_tto_over" xsi:type="AttributeSubItem">
           <target_attcode>tto</target_attcode>
@@ -295,7 +295,7 @@
         </field>
         <field id="sla_ttr_passed" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>
-          <item_code>100_triggered</item_code>
+          <item_code>100_passed</item_code>
         </field>
         <field id="sla_ttr_over" xsi:type="AttributeSubItem">
           <target_attcode>ttr</target_attcode>