--- a/OrthancServer/Sources/Database/FindRequest.h	Wed May 08 13:37:23 2024 +0200
+++ b/OrthancServer/Sources/Database/FindRequest.h	Wed May 08 18:28:36 2024 +0200
@@ -179,7 +179,7 @@
     bool                                 retrieveParentIdentifier_;
     bool                                 retrieveChildrenIdentifiers_;
     std::set<MetadataType>               retrieveChildrenMetadata_;
-    std::set<FileContentType>            retrieveAttachmentOfOneInstance_;
+    bool                                 retrieveOneInstanceIdentifier_;
 
   public:
     explicit FindRequest(ResourceType level);
@@ -191,25 +191,16 @@
       return level_;
     }
 
-    void SetOrthancPatientId(const std::string& id)
-    {
-      orthancIdentifiers_.SetPatientId(id);
-    }
+    void SetOrthancId(ResourceType level,
+                      const std::string& id);
 
-    void SetOrthancStudyId(const std::string& id)
-    {
-      orthancIdentifiers_.SetStudyId(id);
-    }
+    void SetOrthancPatientId(const std::string& id);
 
-    void SetOrthancSeriesId(const std::string& id)
-    {
-      orthancIdentifiers_.SetSeriesId(id);
-    }
+    void SetOrthancStudyId(const std::string& id);
 
-    void SetOrthancInstanceId(const std::string& id)
-    {
-      orthancIdentifiers_.SetInstanceId(id);
-    }
+    void SetOrthancSeriesId(const std::string& id);
+
+    void SetOrthancInstanceId(const std::string& id);
 
     const OrthancIdentifiers& GetOrthancIdentifiers() const
     {
@@ -322,11 +313,14 @@
       return retrieveChildrenMetadata_;
     }
 
-    void AddRetrieveAttachmentOfOneInstance(FileContentType type);
+    void SetRetrieveOneInstanceIdentifier(bool retrieve)
+    {
+      retrieveOneInstanceIdentifier_ = retrieve;
+    }
 
-    const std::set<FileContentType>& GetRetrieveAttachmentOfOneInstance() const
+    bool IsRetrieveOneInstanceIdentifier() const
     {
-      return retrieveAttachmentOfOneInstance_;
+      return retrieveOneInstanceIdentifier_;
     }
   };
 }