diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
index bb6182e978c5ccdac7f60ce074956936723695a1..6c4f15e3b148da713174a840276ab548d85cec85 100644
--- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
+++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java
@@ -94,16 +94,20 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate {
           rlist.add(res);
           
         }
-
-	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);
-	    supd.setState( nextState ); 	
-	    Note n = new Note();
-        n.setText("Service Status Changed to: " +  nextState);
-        n.setAuthor(compname);
-        n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
-        supd.addNoteItem(n);
+        @Valid
+        ServiceStateType currentState = aService.getState();
         
-		aService = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );
+	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);
+	    
+	    if (!currentState.equals(nextState)) {
+	        supd.setState( nextState );     
+	        Note n = new Note();
+	        n.setText("Service Status Changed to: " +  nextState);
+	        n.setAuthor(compname);
+	        n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
+	        supd.addNoteItem(n);	        
+	        aService = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );	      
+	    }
 		
 		if ( aService!= null ) {
 			if ( aService.getState().equals(ServiceStateType.ACTIVE)
diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
index 6aad949a3a9f68aa0d9d0a52647d507688ed3c38..cac5b6ac3a8d1a3d933b36756e1164487be43ff0 100644
--- a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
+++ b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java
@@ -68,6 +68,7 @@ public class CRTerminateTask  implements JavaDelegate {
               map.put("clusterMasterURL",getServiceCharacteristic(aService, "clusterMasterURL")    );
               map.put("org.etsi.osl.serviceId", aService.getId() );
               map.put("org.etsi.osl.serviceOrderId", aService.getServiceOrder().stream().findFirst().get().getId() );
+              map.put("org.etsi.osl.prefixName",getServiceCharacteristic(aService, "org.etsi.osl.prefixName")    );
               map.put("org.etsi.osl.namespace", aService.getServiceOrder().stream().findFirst().get().getId() );
               map.put("org.etsi.osl.statusCheckFieldName",  getServiceCharacteristic(aService, "_CR_CHECK_FIELD")    );
               map.put("org.etsi.osl.statusCheckValueStandby", getServiceCharacteristic(aService, "_CR_CHECKVAL_STANDBY")  );