--- a/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Sat Apr 27 22:15:37 2024 +0200
+++ b/OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp	Fri May 03 17:02:02 2024 +0200
@@ -1173,11 +1173,7 @@
 
           while (statement.Step())
           {
-            OrthancIdentifiers id;
-            id.SetLevel(request.GetLevel(), statement.ColumnString(0));
-
-            FindResponse::Item* item = new FindResponse::Item(id);
-            response.Add(item);
+            response.Add(new FindResponse::Item(request.GetLevel(), statement.ColumnString(0)));
           }
         }
         else
@@ -1201,10 +1197,7 @@
             {
               const std::string resourceId = statement.ColumnString(0);
 
-              OrthancIdentifiers id;
-              id.SetLevel(request.GetLevel(), resourceId);
-
-              FindResponse::Item* item = new FindResponse::Item(id);
+              FindResponse::Item* item = new FindResponse::Item(request.GetLevel(), resourceId);
               items[resourceId] = item;
               response.Add(item);
             }
@@ -1222,9 +1215,10 @@
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              items[resourceId]->AddDicomTag(statement.ColumnInt(1),
-                                             statement.ColumnInt(2),
-                                             statement.ColumnString(3), false);
+              items[resourceId]->AddStringDicomTag(request.GetLevel(),
+                                                   statement.ColumnInt(1),
+                                                   statement.ColumnInt(2),
+                                                   statement.ColumnString(3));
             }
           }
 
@@ -1240,7 +1234,7 @@
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              items[resourceId]->AddChild(statement.ColumnString(1));
+              items[resourceId]->AddChildIdentifier(GetChildResourceType(request.GetLevel()), statement.ColumnString(1));
             }
           }
 
@@ -1255,7 +1249,8 @@
             while (statement.Step())
             {
               const std::string& resourceId = statement.ColumnString(0);
-              items[resourceId]->SetIdentifier(GetParentResourceType(request.GetLevel()), statement.ColumnString(1));
+              const std::string& parentId = statement.ColumnString(1);
+              items[resourceId]->SetParentIdentifier(parentId);
             }
           }