diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index ce4213315e36a581805039a843a4abde5fab78d2..f3430fbc35fea143d9b1623ae8ef8a216fce3fba 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -164,6 +164,9 @@
       <expose v="true" />
       <description>Needed to load ONE Objectrelation together with ObjectIds_param and ObjectTypes_param to determine the side</description>
     </entityParameter>
+    <entityField>
+      <name>OBJECTRELATIONID</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -180,6 +183,9 @@
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>OBJECTRELATIONID.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>TITLE.value</name>
         </jDitoRecordFieldMapping>
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 56da69ea93faf9839f137f598f10d77bbbfb67e7..d4ca5903b5e06415a7e9be72e0c54807555d4a4d 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -53,10 +53,6 @@ if (uidParam && uidParam.includes("[")) // "[" -> is JSON
         _insertEntry(tree, _getEntryData(uid[UID.objectId], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, 
             uid[UID.objectRelationId]), "", 0, uid[UID.otherObjectType], relationTypeData[10], relationTypeData[12], relationTypeData[4]);
     }
-}
-else if (uidParam)
-{
-
 }
 else
 {
@@ -87,6 +83,8 @@ else
             _loadObjectRelationTree(originalObjectIds[i], originalObjectTypes[i], selectedRelationType);
         }
     }
+    if (uidParam) //workaround!
+        tree = tree.filter(function (row) {return JSON.parse(row[0])[UID.objectRelationId] == uidParam});
 }
 
 result.object(tree);
@@ -146,23 +144,24 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
         {
             // load all ObjectRelationTypes
             var relationTypes = _getPossibleRelationTypes(pObjectType);
-
-            for (let i=0; i<relationTypes.length; i++)
-            {                       
-                var data = _getEntryData(currentObjectId, relationTypes[i][3], relationTypes[i][7], relationTypes[i][8]);
+            
+            relationTypes.forEach(function (relationType, i)
+            {
+                var [relationTypeId, title,, direction,,,, relationType1, relationTye2,,,, icon] = relationType;
+                var data = _getEntryData(currentObjectId, direction, relationType1, relationTye2);
 
                 // if any subentry: show objectType
                 if (data.length > 0)
                 {
                     // TODO: Icons, BINDATA
                     // var icon = getIcon...
-                    let uid = [currentObjectId, i, relationTypes[i]];
+                    let uid = [currentObjectId, i, relationType];
                     // add the relationtype as grouping
-                    this.push([JSON.stringify(uid), translate.text(relationTypes[i][1]), JSON.stringify(pNodeId), true, null, null, "", relationTypes[i][0], relationTypes[i][12]]);
+                    this.push([JSON.stringify(uid), null, translate.text(title), JSON.stringify(pNodeId), true, null, null, "", relationTypeId, icon]);
 
                     _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, uid, pLayer+1, relationTypes[i]);
                 }
-            }
+            }, this);
         }
     }
     else if (pLayer >= 1)
@@ -174,15 +173,8 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
         // if it's only the id, load via function
         if (typeof pRelationTypeData == "string")
             pRelationTypeData = ObjectRelationUtils.getRelationType(pRelationTypeData);
-
-        var thisRelationTypeId = pRelationTypeData[0];
-        var otherRelationTypeId = pRelationTypeData[10];            
-        var hierarchy = pRelationTypeData[4];
-        var destObjectType = pRelationTypeData[6];
-        var relationType1 = pRelationTypeData[7];
-        var relationType2 = pRelationTypeData[8];
-        var direction = pRelationTypeData[3];
-        var icon = pRelationTypeData[12];
+        
+        var [thisRelationTypeId,,, direction, hierarchy,, destObjectType, relationType1, relationType2,, otherRelationTypeId,, icon] = pRelationTypeData;
 
         var relationTypeIdForNew = otherRelationTypeId;
 
@@ -311,7 +303,7 @@ function _insertEntry(pTree, pEntryData, pNodeId, pLayer, pObjectType, pNewRelat
         if (pNum)
             uid.push(pNum);
         uids.push(uid);
-        pTree.push([JSON.stringify(uid), display, JSON.stringify(pNodeId), expanded, objectId, pObjectType, info, pNewRelationTypeId, pIcon]);
+        pTree.push([JSON.stringify(uid), objectRelationId, display, JSON.stringify(pNodeId), expanded, objectId, pObjectType, info, pNewRelationTypeId, pIcon]);
     });
     return uids;
 }
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
index 9371c339b55b3edcfbff5b65f25a090770b4f058..b213c506967a5ede2bbf1dffd99b92357587cc8d 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js
@@ -5,7 +5,7 @@ import("system.vars");
 import("system.db");
 
 var rowdata = vars.get("$local.rowdata");
-selectedObjectRelationTypeId = rowdata["OBJECTRELATIONTYPE.value"];
+selectedObjectRelationTypeId = rowdata["OBJECTRELATIONTYPEID.value"];
 if (selectedObjectRelationTypeId)
 {
     relationTypeData = ObjectRelationUtils.getRelationType(selectedObjectRelationTypeId)
@@ -32,11 +32,11 @@ if (selectedObjectRelationTypeId)
             "INFO"
         ], null, [
             rowdata["UID.value"],
-            objectId1,
-            objectId2,
+            objectId1 || "",
+            objectId2 || "",
             relationType1,
             relationType2,
-            info
+            info || ""
         ]);
     }
 }
\ No newline at end of file