diff --git a/src/common/kiwix/library.cpp b/src/common/kiwix/library.cpp
index 882a09dbe..0b6618b1e 100644
--- a/src/common/kiwix/library.cpp
+++ b/src/common/kiwix/library.cpp
@@ -27,7 +27,7 @@ namespace kiwix {
     path(""),
     last(""),
     indexPath(""),
-    indexType(XAPIAN),
+    indexType(UNKNOWN),
     title(""),
     description(""),
     language(""),
diff --git a/src/common/kiwix/library.h b/src/common/kiwix/library.h
index 0a15ca917..a2a61cba2 100644
--- a/src/common/kiwix/library.h
+++ b/src/common/kiwix/library.h
@@ -31,7 +31,7 @@ using namespace std;
 
 namespace kiwix {
 
-  enum supportedIndexType { XAPIAN, CLUCENE };
+  enum supportedIndexType { UNKNOWN, XAPIAN, CLUCENE };
 
   class Book {
 
diff --git a/src/common/kiwix/manager.cpp b/src/common/kiwix/manager.cpp
index 6bbaea0dd..81d9b869d 100644
--- a/src/common/kiwix/manager.cpp
+++ b/src/common/kiwix/manager.cpp
@@ -46,9 +46,9 @@ namespace kiwix {
 	book.readOnly = readOnly;
 	book.id = bookNode.attribute("id").value();
 	book.path = bookNode.attribute("path").value();
-	book.last = bookNode.attribute("last").value() != "undefined" ? bookNode.attribute("last").value() : "";
+	book.last = (std::string(bookNode.attribute("last").value()) != "undefined" ? bookNode.attribute("last").value() : "");
 	book.indexPath = bookNode.attribute("indexPath").value();
-	book.indexType = bookNode.attribute("indexType").value() == "xapian" ? XAPIAN : CLUCENE;
+	book.indexType = (std::string(bookNode.attribute("indexType").value()) == "xapian" ? XAPIAN : CLUCENE);
 	book.title = bookNode.attribute("title").value();
 	book.description = bookNode.attribute("description").value();
 	book.language = bookNode.attribute("language").value();
@@ -107,7 +107,7 @@ namespace kiwix {
 	  bookNode.append_attribute("indexPath") = itr->indexPath.c_str();
 	  if (itr->indexType == XAPIAN)
 	    bookNode.append_attribute("indexType") = "xapian";
-	  else
+	  else if (itr->indexType == CLUCENE)
 	    bookNode.append_attribute("indexType") = "clucene";
 	}