diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 365ff737c..4d8b133d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -136,6 +136,26 @@
         <data android:mimeType="text/plain"/>
       </intent-filter>
     </activity>
+    <activity
+        android:name=".zim_manager.ZimManageActivity"
+        android:label="@string/choose_file"
+        android:launchMode="singleTop">
+      <!-- TODO -->
+      <intent-filter>
+        <action android:name="android.intent.action.GET_CONTENT"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.OPENABLE"/>
+
+        <data android:mimeType="*/*"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="org.kiwix.kiwixmobile.utils.KiwixSearchWidget.TEXT_CLICKED"/>
+        <action android:name="org.kiwix.kiwixmobile.utils.KiwixSearchWidget.ICON_CLICKED"/>
+        <action android:name="org.kiwix.kiwixmobile.utils.KiwixSearchWidget.MIC_CLICKED"/>
+        <action android:name="org.kiwix.kiwixmobile.utils.KiwixSearchWidget.STAR_CLICKED"/>
+      </intent-filter>
+    </activity>
     <activity android:name=".settings.KiwixSettingsActivity"/>
     <activity android:name=".search.SearchActivity"/>
     <activity android:name=".bookmark.BookmarksActivity"/>
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
index 295cab5d4..0578e7686 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixApplication.java
@@ -18,11 +18,11 @@
 package org.kiwix.kiwixmobile;
 
 import android.app.Activity;
-import android.app.Application;
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.multidex.MultiDexApplication;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 import com.squareup.leakcanary.LeakCanary;
 import dagger.android.AndroidInjector;
@@ -34,7 +34,7 @@ import javax.inject.Inject;
 import org.kiwix.kiwixmobile.di.components.ApplicationComponent;
 import org.kiwix.kiwixmobile.di.components.DaggerApplicationComponent;
 
-public class KiwixApplication extends Application implements HasActivityInjector {
+public class KiwixApplication extends MultiDexApplication implements HasActivityInjector {
 
   private static KiwixApplication application;
   private static ApplicationComponent applicationComponent;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/Repository.java b/app/src/main/java/org/kiwix/kiwixmobile/data/Repository.java
index ad65a8c74..3b48bcf30 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/data/Repository.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/Repository.java
@@ -1,11 +1,10 @@
 package org.kiwix.kiwixmobile.data;
 
 import io.reactivex.Completable;
-import io.reactivex.Observable;
 import io.reactivex.Scheduler;
 import io.reactivex.Single;
+import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.kiwix.kiwixmobile.data.local.dao.BookDao;
@@ -52,7 +51,7 @@ public class Repository implements DataSource {
 
   @Override
   public Single<List<LibraryNetworkEntity.Book>> getLanguageCategorizedBooks() {
-    return Observable.fromIterable(bookDao.getBooks())
+    return /*Observable.fromIterable(bookDao.getBooks())
         .toSortedList(
             (book1, book2) -> book1.getLanguage().compareToIgnoreCase(book2.getLanguage()) == 0 ?
                 book1.getTitle().compareToIgnoreCase(book2.getTitle()) :
@@ -73,7 +72,8 @@ public class Repository implements DataSource {
             book = books.get(position);
           }
           return books;
-        })
+        })*/
+        Single.just(Collections.<LibraryNetworkEntity.Book>emptyList())
         .subscribeOn(io)
         .observeOn(mainThread);
   }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
index 432468e49..72afb3cbc 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/data/local/KiwixDatabase.java
@@ -72,7 +72,11 @@ public class KiwixDatabase extends SquidDatabase {
 
   @Override
   protected Table[] getTables() {
-    return new Table[] {};
+    return new Table[] {
+        RecentSearch.TABLE,
+        Bookmark.TABLE,
+        History.TABLE
+    };
   }
 
   @Override
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.java
index 041e8c320..115644159 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/language/LanguageActivity.java
@@ -87,7 +87,7 @@ public class LanguageActivity extends BaseActivity implements LanguageContract.V
 
         Toast.makeText(this, getString(R.string.languages_saved), Toast.LENGTH_SHORT).show();
         Intent intent = new Intent();
-        //intent.putParcelableArrayListExtra(LANGUAGE_LIST, languages);
+        intent.putParcelableArrayListExtra(LANGUAGE_LIST, languages);
         setResult(RESULT_OK, intent);
         finish();
         return true;
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/Language.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/Language.kt
index 9191daca0..27818e3e1 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/Language.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/library_view/adapter/Language.kt
@@ -1,7 +1,10 @@
 package org.kiwix.kiwixmobile.zim_manager.library_view.adapter
 
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
 import java.util.Locale
 
+@Parcelize
 data class Language constructor(
   var active: Boolean,
   var occurencesOfLanguage: Int,
@@ -9,7 +12,7 @@ data class Language constructor(
   var languageLocalized: String,
   var languageCode: String,
   var languageCodeISO2: String
-) {
+) : Parcelable {
   constructor(
     locale: Locale,
     active: Boolean,
@@ -32,4 +35,4 @@ data class Language constructor(
   override fun equals(other: Any?): Boolean {
     return (other as Language).language == language && other.active == active
   }
-}
\ No newline at end of file
+}