--- a/OrthancServer/Sources/Database/FindRequest.cpp	Wed Sep 11 16:31:11 2024 +0200
+++ b/OrthancServer/Sources/Database/FindRequest.cpp	Wed Sep 11 20:49:34 2024 +0200
@@ -93,7 +93,7 @@
     retrieveLabels_(false),
     retrieveAttachments_(false),
     retrieveParentIdentifier_(false),
-    retrieveOneInstanceIdentifier_(false)
+    retrieveOneInstanceMetadataAndAttachments_(false)
   {
   }
 
@@ -246,7 +246,7 @@
   }
 
 
-  void FindRequest::SetRetrieveOneInstanceIdentifier(bool retrieve)
+  void FindRequest::SetRetrieveOneInstanceMetadataAndAttachments(bool retrieve)
   {
     if (level_ == ResourceType_Instance)
     {
@@ -254,7 +254,20 @@
     }
     else
     {
-      retrieveOneInstanceIdentifier_ = retrieve;
+      retrieveOneInstanceMetadataAndAttachments_ = retrieve;
+    }
+  }
+
+
+  bool FindRequest::IsRetrieveOneInstanceMetadataAndAttachments() const
+  {
+    if (level_ == ResourceType_Instance)
+    {
+      throw OrthancException(ErrorCode_BadSequenceOfCalls);
+    }
+    else
+    {
+      return retrieveOneInstanceMetadataAndAttachments_;
     }
   }
 }