diff --git a/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelector.kt b/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelector.kt
index 88824cd8..1707fb6a 100644
--- a/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelector.kt
+++ b/app/src/main/java/com/bnyro/translate/ui/components/LanguageSelector.kt
@@ -261,7 +261,6 @@ fun LanguageSelector(
 private fun validateFilter(language: Language, query: String): Boolean {
     if (query.isEmpty()) return true
 
-    val lowerQuery = query.lowercase()
-    return language.name.lowercase().contains(lowerQuery) ||
-        language.code.lowercase().contains(lowerQuery)
+    return language.name.lowercase().contains(query, ignoreCase = true) ||
+        language.code.lowercase().contains(query, ignoreCase = true)
 }
diff --git a/app/src/main/java/com/bnyro/translate/ui/models/TessModel.kt b/app/src/main/java/com/bnyro/translate/ui/models/TessModel.kt
index 0385921c..fff4b81d 100644
--- a/app/src/main/java/com/bnyro/translate/ui/models/TessModel.kt
+++ b/app/src/main/java/com/bnyro/translate/ui/models/TessModel.kt
@@ -20,7 +20,6 @@ package com.bnyro.translate.ui.models
 import android.content.Context
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -28,12 +27,10 @@ import com.bnyro.translate.obj.TessLanguage
 import com.bnyro.translate.util.TessHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class TessModel: ViewModel() {
     var availableLanguages by mutableStateOf(emptyList<TessLanguage>())
     var downloadedLanguages by mutableStateOf(emptyList<String>())
-    var notYetDownloadedLanguages by mutableStateOf(emptyList<TessLanguage>())
 
     fun init(context: Context) {
         downloadedLanguages = TessHelper.getDownloadedLanguages(context)
diff --git a/app/src/main/java/com/bnyro/translate/ui/views/TessSettings.kt b/app/src/main/java/com/bnyro/translate/ui/views/TessSettings.kt
index 434aa4ab..fe2366ea 100644
--- a/app/src/main/java/com/bnyro/translate/ui/views/TessSettings.kt
+++ b/app/src/main/java/com/bnyro/translate/ui/views/TessSettings.kt
@@ -99,17 +99,15 @@ fun TessSettings(
     }
 
     LaunchedEffect(query, tessModel.availableLanguages, tessModel.downloadedLanguages) {
-        val lowerQuery = query.lowercase()
-
         filteredAvailableLanguages = tessModel.availableLanguages.filter { tessLang ->
-            tessLang.path.replace(TessHelper.DATA_FILE_SUFFIX, "").contains(lowerQuery) &&
+            tessLang.path.replace(TessHelper.DATA_FILE_SUFFIX, "").contains(query, ignoreCase = true) &&
                     tessModel.downloadedLanguages.none {
                         tessLang.path.replace(TessHelper.DATA_FILE_SUFFIX, "") == it
                     }
         }
 
         filteredDownloadedLanguages = tessModel.downloadedLanguages.filter { lang ->
-            lowerQuery.contains(lang)
+            lang.contains(query, ignoreCase = true)
         }
     }
 
@@ -117,6 +115,10 @@ fun TessSettings(
         override fun onReceive(context: Context, intent: Intent) {
             // Refresh the downloaded languages every time a download finishes
             tessModel.refreshDownloadedLanguages(context)
+            if (tessModel.downloadedLanguages.size == 1) {
+                selectedLanguage = tessModel.downloadedLanguages.first()
+                Preferences.put(Preferences.tessLanguageKey, selectedLanguage)
+            }
         }
     }