diff --git a/src/common/kiwix/indexer.cpp b/src/common/kiwix/indexer.cpp
index 0092bc8d0..69e244643 100644
--- a/src/common/kiwix/indexer.cpp
+++ b/src/common/kiwix/indexer.cpp
@@ -24,13 +24,16 @@ namespace kiwix {
   /* Count word */
   unsigned int Indexer::countWords(const string &text) {
     unsigned int numWords = 1;
-    for(unsigned int i=0; i<text.size();) {
-      while(i<text.size() && text[i] != ' ') {
+    unsigned int length = text.size();
+
+    for(unsigned int i=0; i<length;) {
+      while(i<length && text[i] != ' ') {
 	i++;
       }
       numWords++;
       i++;
     }
+
     return numWords;
   }
   
diff --git a/src/common/kiwix/manager.cpp b/src/common/kiwix/manager.cpp
index bf2726d41..45e1c282d 100644
--- a/src/common/kiwix/manager.cpp
+++ b/src/common/kiwix/manager.cpp
@@ -427,6 +427,10 @@ namespace kiwix {
     return false;
   }
 
+  bool Manager::setBookIndex(const string id, const string path) {
+    return this->setBookIndex(id, path, XAPIAN);
+  }
+
   bool Manager::setBookPath(const string id, const string path) {
     std::vector<kiwix::Book>::iterator itr;
     for ( itr = library.books.begin(); itr != library.books.end(); ++itr ) {
diff --git a/src/common/kiwix/manager.h b/src/common/kiwix/manager.h
index 6190a1c65..453ba9054 100644
--- a/src/common/kiwix/manager.h
+++ b/src/common/kiwix/manager.h
@@ -54,6 +54,7 @@ namespace kiwix {
     bool setCurrentBookId(const string id);
     string getCurrentBookId();
     bool setBookIndex(const string id, const string path, const supportedIndexType type);
+    bool setBookIndex(const string id, const string path);
     bool setBookPath(const string id, const string path);
     string addBookFromPathAndGetId(const string pathToOpen, const string pathToSave = "", const string url = "",
 				   const bool checkMetaData = false);