diff --git a/src/reader.cpp b/src/reader.cpp
index 1abc9eadb..48b826500 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -510,6 +510,7 @@ bool Reader::searchSuggestionsSmart(const string& prefix,
       suggestion.push_back(current.getTitle());
       suggestion.push_back(current.getPath());
       suggestion.push_back(kiwix::normalize(current.getTitle()));
+      suggestion.push_back(current.getSnippet());
       results.push_back(suggestion);
     }
     retVal = true;
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index f28c3df03..381a56c1d 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -415,6 +415,11 @@ std::unique_ptr<Response> InternalServer::handle_suggest(const RequestContext& r
     for(auto& suggestion:suggestions) {
       MustacheData result;
       result.set("label", suggestion[0]);
+
+      if (!suggestion[3].empty()) {
+        result.set("label", suggestion[3]);
+      }
+
       result.set("value", suggestion[0]);
       result.set("kind", "path");
       result.set("path", suggestion[1]);