diff --git a/app/src/main/java/org/kiwix/kiwixmobile/search/SearchActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/search/SearchActivity.java
index 7cc8727b5..2c3bb52da 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/search/SearchActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/search/SearchActivity.java
@@ -57,6 +57,7 @@ import javax.inject.Inject;
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_IS_WIDGET_VOICE;
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_SEARCH;
 import static org.kiwix.kiwixmobile.utils.Constants.TAG_FILE_SEARCHED;
+import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_SEARCH_TEXT;
 import static org.kiwix.kiwixmobile.utils.StyleUtils.dialogStyle;
 
 public class SearchActivity extends AppCompatActivity
@@ -89,7 +90,7 @@ public class SearchActivity extends AppCompatActivity
     setContentView(contentView);
 
     if (savedInstanceState != null) {
-      searchText = savedInstanceState.getString("text");
+      searchText = savedInstanceState.getString(EXTRA_SEARCH_TEXT);
     }
     Toolbar toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
@@ -138,7 +139,7 @@ public class SearchActivity extends AppCompatActivity
     MenuItemCompat.expandActionView(searchMenuItem);
     searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
     if (searchText != null) {
-      searchView.setQuery(searchText, Boolean.FALSE);
+      searchView.setQuery(searchText, false);
       mListView.setAdapter(mAutoAdapter);
       mAutoAdapter.getFilter().filter(searchText.toLowerCase());
     }
@@ -310,6 +311,6 @@ public class SearchActivity extends AppCompatActivity
   @Override
   protected void onSaveInstanceState(Bundle outState) {
     super.onSaveInstanceState(outState);
-    outState.putString("text", searchView.getQuery().toString());
+    outState.putString(EXTRA_SEARCH_TEXT, searchView.getQuery().toString());
   }
 }
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java b/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
index 946fc2d40..70062bdff 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java
@@ -121,4 +121,6 @@ public final class Constants {
     public static final String EXTRA_WEBVIEWS_LIST = "webviewsList";
 
     public static final String EXTRA_BOOKMARK_CONTENTS = "bookmark_contents";
+
+    public static final String EXTRA_SEARCH_TEXT = "searchText";
 }