diff --git a/src/index/fsindexer.cpp b/src/index/fsindexer.cpp
index 478a918a..c77c9b61 100644
--- a/src/index/fsindexer.cpp
+++ b/src/index/fsindexer.cpp
@@ -713,13 +713,19 @@ FsIndexer::processonefile(RclConfig *config,
 		make_udi(fn, doc.ipath, udi);
 	    }
 
-	    // Set file name, mod time and url if not done by filter
+	    // Set file name, mod time and url if not done by
+            // filter. We used to set the top-level container file
+            // name for all subdocs without a proper file name, but
+            // this did not make sense (resulted in multiple not
+            // useful hits on the subdocs when searching for the
+            // file name).
 	    if (doc.fmtime.empty())
 		doc.fmtime = ascdate;
 	    if (doc.url.empty())
 		doc.url = cstr_fileu + fn;
 	    const string *fnp = 0;
-	    if (!doc.peekmeta(Rcl::Doc::keyfn, &fnp) || fnp->empty())
+	    if (doc.ipath.empty() &&
+                (!doc.peekmeta(Rcl::Doc::keyfn, &fnp) || fnp->empty()))
 		doc.meta[Rcl::Doc::keyfn] = utf8fn;
 
 	    char cbuf[100];