diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index 426356a..146056e 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -224,37 +224,13 @@ static int accessHandlerCallback(void *cls,
     
     /* Get the suggestions */
     content = "[";
-    reader->searchSuggestions(term, maxSuggestionCount);
+    reader->searchSuggestionsSmart(term, maxSuggestionCount);
     while (reader->getNextSuggestion(suggestion)) {
       kiwix::stringReplacement(suggestion, "\"", "\\\"");
       content += (content == "[" ? "" : ",");
       content += "{\"value\":\"" + suggestion + "\",\"label\":\"" + suggestion + "\"}";
       suggestionCount++;
     }
-    
-    /* Try to get further suggestions with ucFirst(pattern) if maxSuggestionCount is not reached */
-    if (suggestionCount < 10) {
-      term = kiwix::ucFirst(term);
-      reader->searchSuggestions(term, maxSuggestionCount);
-      while (reader->getNextSuggestion(suggestion) && suggestionCount < 10) {
-	kiwix::stringReplacement(suggestion, "\"", "\\\"");
-	content += (content == "[" ? "" : ",");
-	content += "{\"value\":\"" + suggestion + "\",\"label\":\"" + suggestion + "\"}";
-	suggestionCount++;
-      }
-    }
-
-    /* Try to get further suggestions with lcFirst(pattern) if maxSuggestionCount is not reached */
-    if (suggestionCount < 10) {
-      term = kiwix::lcFirst(term);
-      reader->searchSuggestions(term, maxSuggestionCount);
-      while (reader->getNextSuggestion(suggestion) && suggestionCount < 10)  {
-	kiwix::stringReplacement(suggestion, "\"", "\\\"");
-	content += (content == "[" ? "" : ",");
-	content += "{\"value\":\"" + suggestion + "\",\"label\":\"" + suggestion + "\"}";
-	suggestionCount++;
-      }
-    }
 
     content += (suggestionCount == 0 ? "" : ",");
     content += "{\"value\":\"" + std::string(term) + " \", \"label\":\"containing '" + std::string(term) + "'...\"}]";