--- a/OrthancServer/Sources/Database/FindRequest.h	Fri May 03 18:30:29 2024 +0200
+++ b/OrthancServer/Sources/Database/FindRequest.h	Fri May 03 21:26:06 2024 +0200
@@ -165,11 +165,7 @@
     LabelsConstraint                     labelsContraint_;
     std::deque<Ordering*>                ordering_;             // The ordering criteria (note: the order is important !)
 
-    bool                                 retrievePatientTags_;
-    bool                                 retrieveStudyTags_;
-    bool                                 retrieveSeriesTags_;
-    bool                                 retrieveInstanceTags_;
-
+    bool                                 retrieveMainDicomTags_;
     bool                                 retrieveMetadata_;
     bool                                 retrieveLabels_;
     bool                                 retrieveAttachments_;
@@ -177,8 +173,6 @@
     bool                                 retrieveChildrenIdentifiers_;
     bool                                 retrieveChildrenMetadata_;
 
-    bool IsCompatibleLevel(ResourceType levelOfInterest) const;
-
   public:
     explicit FindRequest(ResourceType level);
 
@@ -240,11 +234,6 @@
 
     uint64_t GetLimitsCount() const;
 
-    void SetRetrieveTagsAtLevel(ResourceType levelOfInterest,
-                                bool retrieve);
-
-    bool IsRetrieveTagsAtLevel(ResourceType levelOfInterest) const;
-
     void AddOrdering(const DicomTag& tag, OrderingDirection direction);
 
     void AddOrdering(MetadataType metadataType, OrderingDirection direction);
@@ -274,6 +263,16 @@
       retrieveMetadata_ = retrieve;
     }
 
+    bool IsRetrieveMainDicomTags() const
+    {
+      return retrieveMainDicomTags_;
+    }
+
+    void SetRetrieveMainDicomTags(bool retrieve)
+    {
+      retrieveMainDicomTags_ = retrieve;
+    }
+
     bool IsRetrieveMetadata() const
     {
       return retrieveMetadata_;