diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp
index 622eb0f2..44c87a6d 100644
--- a/src/rcldb/rcldb.cpp
+++ b/src/rcldb/rcldb.cpp
@@ -1064,7 +1064,7 @@ void *DbUpdWorker(void* vdbp)
 // date, mime type etc. , create the document data record (more
 // metadata), and update database
 bool Db::addOrUpdate(const string &udi, const string &parent_udi,
-		     const Doc &idoc)
+		     Doc &doc)
 {
     LOGDEB(("Db::add: udi [%s] parent [%s]\n", 
 	     udi.c_str(), parent_udi.c_str()));
@@ -1084,8 +1084,6 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi,
 	m_occtxtsz = m_curtxtsz;
     }
 
-    Doc doc = idoc;
-
     Xapian::Document newdocument;
 
     // The term processing pipeline:
diff --git a/src/rcldb/rcldb.h b/src/rcldb/rcldb.h
index 271d28ce..8adffa48 100644
--- a/src/rcldb/rcldb.h
+++ b/src/rcldb/rcldb.h
@@ -153,7 +153,7 @@ class Db {
       * possible depending on the document type. parent_udi is only
       * use for subdocs, else set it to empty */
     bool addOrUpdate(const string &udi, const string &parent_udi, 
-		     const Doc &doc);
+		     Doc &doc);
 
     /** Delete document(s) for given UDI, including subdocs */
     bool purgeFile(const string &udi, bool *existed = 0);
diff --git a/src/rcldb/rcldoc.h b/src/rcldb/rcldoc.h
index c86d4d59..f243a39d 100644
--- a/src/rcldb/rcldoc.h
+++ b/src/rcldb/rcldoc.h
@@ -54,18 +54,19 @@ class Doc {
     string utf8fn; 
 
     // Internal path for multi-doc files. Ascii
-    // Set by DbIndexer::processone    
+    // Set by FsIndexer::processone    
     string ipath;
 
     // Mime type. Set by FileInterner::internfile
     string mimetype;     
 
     // File modification time as decimal ascii unix time
-    // Set by DbIndexer::processone
+    // Set by FsIndexer::processone
     string fmtime;
 
     // Data reference date (same format). Ie: mail date
     // Possibly set by mimetype-specific handler
+    // Filter::metaData["modificationdate"]
     string dmtime;
 
     // Charset we transcoded the 'text' field from (in case we want back)