--- a/OrthancServer/Search/LookupResource.h	Tue Oct 27 12:45:50 2015 +0100
+++ b/OrthancServer/Search/LookupResource.h	Tue Oct 27 16:05:42 2015 +0100
@@ -36,6 +36,7 @@
 #include "SetOfResources.h"
 
 #include <memory>
+#include <boost/thread/mutex.hpp>
 
 namespace Orthanc
 {
@@ -78,7 +79,9 @@
                     ResourceType level,
                     IDatabaseWrapper& database) const;
 
-    void ApplyUnoptimizedConstraints(SetOfResources& candidates,
+    bool ApplyUnoptimizedConstraints(std::list<int64_t>& result,
+                                     const std::list<int64_t>& candidates,
+                                     boost::mutex& databaseMutex,
                                      IDatabaseWrapper& database,
                                      IStorageArea& storageArea) const;
 
@@ -89,6 +92,10 @@
 
     void Add(IFindConstraint* constraint);   // Takes ownership
 
+    void Add(const DicomTag& tag,
+             const std::string& dicomQuery,
+             bool caseSensitivePN);
+
     void SetMaxResults(size_t maxResults)
     {
       maxResults_ = maxResults;
@@ -99,11 +106,13 @@
       return maxResults_;
     }
 
-    void Apply(std::list<int64_t>& result,
+    bool Apply(std::list<int64_t>& result,
+               boost::mutex& databaseMutex,
                IDatabaseWrapper& database,
                IStorageArea& storageArea) const;
 
-    void Apply(std::list<std::string>& result,
+    bool Apply(std::list<std::string>& result,
+               boost::mutex& databaseMutex,
                IDatabaseWrapper& database,
                IStorageArea& storageArea) const;
   };