diff --git a/src/main/java/li/strolch/model/Order.java b/src/main/java/li/strolch/model/Order.java
index 442b13132..feec6abc5 100644
--- a/src/main/java/li/strolch/model/Order.java
+++ b/src/main/java/li/strolch/model/Order.java
@@ -160,7 +160,7 @@ public class Order extends GroupedParameterizedElement {
 
 	@Override
 	protected void fillLocator(LocatorBuilder lb) {
-		lb.append(Tags.ORDER).append(getId());
+		lb.append(Tags.ORDER).append(getType()).append(getId());
 	}
 
 	@Override
diff --git a/src/main/java/li/strolch/model/Resource.java b/src/main/java/li/strolch/model/Resource.java
index 3f7f909ef..63b36e552 100644
--- a/src/main/java/li/strolch/model/Resource.java
+++ b/src/main/java/li/strolch/model/Resource.java
@@ -74,7 +74,7 @@ public class Resource extends GroupedParameterizedElement {
 
 	@Override
 	protected void fillLocator(LocatorBuilder lb) {
-		lb.append(Tags.RESOURCE).append(getId());
+		lb.append(Tags.RESOURCE).append(getType()).append(getId());
 	}
 
 	@Override