--- a/OrthancServer/Search/DicomTagConstraint.h	Mon Dec 17 17:05:28 2018 +0100
+++ b/OrthancServer/Search/DicomTagConstraint.h	Tue Dec 18 12:50:27 2018 +0100
@@ -47,6 +47,7 @@
     class RegularExpression;
 
     DicomTag                tag_;
+    DicomTagType            tagType_;
     ConstraintType          constraintType_;
     std::set<std::string>   values_;
     bool                    caseSensitive_;
@@ -54,6 +55,12 @@
 
     boost::shared_ptr<RegularExpression>  regex_;
 
+    DicomTagConstraint() :
+      tag_(0, 0),
+      tagType_(DicomTagType_Generic)
+    {
+    }
+    
   public:
     DicomTagConstraint(const DicomTag& tag,
                        ConstraintType type,
@@ -67,12 +74,25 @@
                        bool caseSensitive,
                        bool mandatory);
 
+    DicomTagConstraint* Clone() const;    
+
     const DicomTag& GetTag() const
     {
       return tag_;
     }
 
-    ConstraintType GetType() const
+    DicomTagType GetTagType() const
+    {
+      return tagType_;
+    }
+
+    // Set by "ServerIndex::NormalizeLookup()"
+    void SetTagType(DicomTagType type)
+    {
+      tagType_ = type;
+    }
+    
+    ConstraintType GetConstraintType() const
     {
       return constraintType_;
     }
@@ -82,6 +102,11 @@
       return caseSensitive_;
     }
 
+    void SetCaseSensitive(bool caseSensitive)
+    {
+      caseSensitive_ = caseSensitive;
+    }
+
     bool IsMandatory() const
     {
       return mandatory_;