diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp
index 7442d17e2..e74591e04 100644
--- a/src/common/kiwix/indexer.cpp
+++ b/src/common/kiwix/indexer.cpp
@@ -132,7 +132,10 @@ namespace kiwix {
 	  const std::string wordCountString = countWordStringStream.str();
 
 	  /* snippet */
-	  const std::string snippet = std::string(this->htmlParser.dump, 0, 300);
+	  std::string snippet = std::string(this->htmlParser.dump, 0, 300);
+	  std::string::size_type last = snippet.find_last_of('.');
+	  if (last != snippet.npos)
+	    snippet = snippet.substr(0, last+1);
 
 	  /* size */
 	  stringstream sizeStringStream;
diff --git a/src/common/kiwix/searcher.cpp b/src/common/kiwix/searcher.cpp
index b6a5255c3..95815fc66 100644
--- a/src/common/kiwix/searcher.cpp
+++ b/src/common/kiwix/searcher.cpp
@@ -178,7 +178,7 @@ namespace kiwix {
     }
     oData["pages"] = pagesCDT;
 
-    oData["count"] = this->estimatedResultCount;
+    oData["count"] = this->beautifyInteger(this->estimatedResultCount);
     oData["searchPattern"] = this->searchPattern;
     oData["resultStart"] = this->resultStart;
     oData["resultEnd"] = this->resultEnd;