diff --git a/src/engine/documenturldb.h b/src/engine/documenturldb.h
--- a/src/engine/documenturldb.h
+++ b/src/engine/documenturldb.h
@@ -126,9 +126,11 @@
 
         } else if (parentId == path.parentId) {
             auto newname = url.mid(lastSlash + 1);
-            qDebug() << docId << url << "renaming" << path.name << "to" << newname;
-            path.name = newname;
-            idFilenameDb.put(docId, path);
+            if (newname != path.name) {
+                qDebug() << docId << url << "renaming" << path.name << "to" << newname;
+                path.name = newname;
+                idFilenameDb.put(docId, path);
+            }
             return;
         }
     }
diff --git a/src/file/xattrindexer.cpp b/src/file/xattrindexer.cpp
--- a/src/file/xattrindexer.cpp
+++ b/src/file/xattrindexer.cpp
@@ -73,8 +73,7 @@
             continue;
         }
 
-        // FIXME: Do we also need to update the ctime of the file?
-        tr.replaceDocument(job.document(), XAttrTerms);
+        tr.replaceDocument(job.document(), XAttrTerms | DocumentTime | FileNameTerms | DocumentUrl);
     }
 
     tr.commit();