diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index d56cb3894f86ae4685f92c30e4c0b8fc960bab69..3ef61931f62ff67cee90be6f63d99ba300de0d96 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.tag");
 import("system.translate");
 import("system.project");
 import("system.logging");
@@ -16,8 +17,8 @@ if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
     var seekedByCore = vars.get("$local.idvalues");
     var seekedByCoreFavos = [];
     
-    var config = favorite.createGetFavoriteByIdConfig().setIds(seekedByCore);
-    seekedByCoreFavos = buildFavoritesForDeletion(favorite.getFavorites(config));
+    var config = tag.createGetTaggedObjectByIdConfig().setIds(seekedByCore);
+    seekedByCoreFavos = buildFavoritesForDeletion(tag.getTaggedObjects(config));
 
     result.object(seekedByCoreFavos);
 }
@@ -45,7 +46,7 @@ else
      * load all contexts and all favorites
      */
     var allContexts = getAllFavoriteEnabledContexts();
-    var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig().setUserId(tools.getCurrentUser()[tools.NAME]));
+    var allFavorites = tag.getTaggedObjects(tag.createGetTaggedObjectsConfig().setUserId(tools.getCurrentUser()[tools.NAME]));
     
     /*
      * complete-load (in buildFavorites) favorites by one context at a time
@@ -174,20 +175,20 @@ function getFavoriteWith(loadedRow, builtFavos, favoriten, pRowid, objecttype)
         if(favoriten[b]["rowid"].equals(pRowid))
         {
                 
-            var groupid = favoriten[b]["group"]["groupid"];
-            var grouptitle = favoriten[b]["group"]["grouptitle"];
-            var grouptype = favoriten[b]["group"]["grouptype"];
+            var tagid = favoriten[b]["tag"]["tagid"];
+            var tagtitle = favoriten[b]["tag"]["tagtitle"];
+            var tagtype = favoriten[b]["tag"]["tagtype"];
             var image = loadedRow["#IMAGE"];
             var rowid = favoriten[b]["rowid"];
             var title = loadedRow["#CONTENTTITLE"];
             var description = loadedRow["#CONTENTDESCRIPTION"];
             var id = favoriten[b]["id"];
-            var user = favoriten[b]["group"]["groupuser"];
+            var user = favoriten[b]["tag"]["taguser"];
 
             builtFavos.push([
-                groupid,
-                grouptitle,
-                grouptype, 
+                tagid,
+                tagtitle,
+                tagtype, 
                 objecttype, 
                 image,
                 rowid,
@@ -226,21 +227,21 @@ function buildFavoritesForDeletion(favos)
     
     for(i = 0; i < favos.length; i++)
     {
-        var groupid = favos[i]["group"]["groupid"];
-        var grouptitle = favos[i]["group"]["grouptitle"];
-        var grouptype = favos[i]["group"]["grouptype"];
+        var tagid = favos[i]["tag"]["tagid"];
+        var tagtitle = favos[i]["tag"]["tagtitle"];
+        var tagtype = favos[i]["tag"]["tagtype"];
         var objecttype = favos[i]["objecttype"];
         var image = "";
         var rowid = favos[i]["rowid"];
         var title = "";
         var description = "";
         var id = favos[i]["id"];
-        var user = favos[i]["group"]["groupuser"];
+        var user = favos[i]["tag"]["taguser"];
     
         results.push([
-            groupid,
-            grouptitle,
-            grouptype, 
+            tagid,
+            tagtitle,
+            tagtype, 
             objecttype, 
             image,
             rowid,