diff --git a/src/library.cpp b/src/library.cpp
index 702bf8bdd..98482d87d 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -436,7 +436,7 @@ void Library::updateBookDB(const Book& book)
   }
   indexer.index_text(normalizeText(book.getCreator()),   1, "A");
   indexer.index_text(normalizeText(book.getPublisher()), 1, "XP");
-  indexer.index_text(normalizeText(book.getName()),      1, "XN");
+  doc.add_term("XN"+normalizeText(book.getName()));
   indexer.index_text(normalizeText(book.getCategory()),  1, "XC");
 
   for ( const auto& tag : split(normalizeText(book.getTags()), ";") ) {
diff --git a/test/library.cpp b/test/library.cpp
index 30a77fcff..7f364e42f 100644
--- a/test/library.cpp
+++ b/test/library.cpp
@@ -218,7 +218,7 @@ const char sampleLibraryXML[] = R"(
         creator="Wikibooks"
         publisher="Kiwix & Some Enthusiasts"
         date="2021-04-11"
-        name="wikibooks_de"
+        name="wikibooks.de"
         tags="unittest;wikibooks;_category:wikibooks"
         articleCount="12"
         mediaCount="0"
@@ -680,17 +680,38 @@ TEST_F(LibraryTest, filterByPublisher)
 
 TEST_F(LibraryTest, filterByName)
 {
-  EXPECT_FILTER_RESULTS(kiwix::Filter().name("wikibooks_de"),
+  EXPECT_FILTER_RESULTS(kiwix::Filter().name("wikibooks.de"),
     "An example ZIM archive"
   );
 
-  EXPECT_FILTER_RESULTS(kiwix::Filter().query("name:wikibooks_de"),
+  // Parsing the query with `name:` prefix splits the token on the dot, as if it was 2 sentences.
+  // It creates a query "XNwikibook@1 PHRASE 2 XNde@2".
+  // I haven't found the syntax to not split on dot.
+  EXPECT_FILTER_RESULTS(kiwix::Filter().query("name:wikibooks.de"),
+    /* no results */
+  );
+
+  EXPECT_FILTER_RESULTS(kiwix::Filter().name("wikibooks"),
+    /* no results */
+  );
+
+  // Wikibooks is in `tags` so it matches.
+  EXPECT_FILTER_RESULTS(kiwix::Filter().query("wikibooks"),
     "An example ZIM archive"
   );
 
-  EXPECT_FILTER_RESULTS(kiwix::Filter().query("wikibooks_de"),
+  // But "wikibooks.de" is only in name and `query` doesn't looks in name.
+  EXPECT_FILTER_RESULTS(kiwix::Filter().query("wikibooks.de"),
     /* no results */
   );
+
+  EXPECT_FILTER_RESULTS(kiwix::Filter().name("wikipedia_en_ray_charles"),
+    "Ray Charles"
+  );
+
+  EXPECT_FILTER_RESULTS(kiwix::Filter().query("name:wikipedia_en_ray_charles"),
+    "Ray Charles"
+  );
 }
 
 TEST_F(LibraryTest, filterByCategory)