diff --git a/lib/data/data_providers/file_system_data_provider.dart b/lib/data/data_providers/file_system_data_provider.dart
index 82999882..d63d8384 100644
--- a/lib/data/data_providers/file_system_data_provider.dart
+++ b/lib/data/data_providers/file_system_data_provider.dart
@@ -273,7 +273,7 @@ class FileSystemData {
   /// Reads the file line by line and returns the content at the specified index.
   Future<String> getLinkContent(Link link) async {
     String path = await _getBookPath(getTitleFromPath(link.path2));
-    return Isolate.run(() async => await getLineFromFile(path, link.index2));
+    return await getLineFromFile(path, link.index2);
   }
 
   /// Returns a list of all book paths in the library directory.
@@ -304,14 +304,16 @@ class FileSystemData {
   /// Uses a stream to read the file line by line until the desired index
   /// is reached, then closes the stream to conserve resources.
   Future<String> getLineFromFile(String path, int index) async {
-    File file = File(path);
-    final lines = file
-        .openRead()
-        .transform(utf8.decoder)
-        .transform(const LineSplitter())
-        .take(index)
-        .toList();
-    return (await lines).last;
+    return await Isolate.run(() async {
+      File file = File(path);
+      final lines = file
+          .openRead()
+          .transform(utf8.decoder)
+          .transform(const LineSplitter())
+          .take(index)
+          .toList();
+      return (await lines).last;
+    });
   }
 
   /// Updates the mapping of book titles to their file system paths.
diff --git a/lib/data/repository/data_repository.dart b/lib/data/repository/data_repository.dart
index 00b385af..723e92d6 100644
--- a/lib/data/repository/data_repository.dart
+++ b/lib/data/repository/data_repository.dart
@@ -115,7 +115,7 @@ class DataRepository {
   ///   - [library]: The library containing books to index
   ///   - [start]: Starting index for batch processing (defaults to 0)
   ///   - [end]: Ending index for batch processing (defaults to 100000)
-  Future<void> addAllTextsToMimir(Library library,
+  addAllTextsToTantivy(Library library,
       {int start = 0, int end = 100000}) async {
     _mimirDataProvider.addAllTBooksToTantivy(library, start: start, end: end);
   }
diff --git a/lib/models/app_model.dart b/lib/models/app_model.dart
index 8c1617bd..61f183db 100644
--- a/lib/models/app_model.dart
+++ b/lib/models/app_model.dart
@@ -439,42 +439,54 @@ class AppModel with ChangeNotifier {
   Future<List<Book>> findBooks(String query, Category? category,
       {List<String>? topics}) async {
     final queryWords = query.split(RegExp(r'\s+'));
-    var books = category?.getAllBooks() ?? (await library).getAllBooks();
+    var allBooks = category?.getAllBooks() ?? (await library).getAllBooks();
     if (showOtzarHachochma.value) {
-      books += await otzarBooks;
+      allBooks += await otzarBooks;
     }
     if (showHebrewBooks.value) {
-      books += await hebrewBooks;
+      allBooks += await hebrewBooks;
     }
-    var filteredBooks = books.where((book) {
+
+    // First, filter books outside of isolate to get the working set
+    var filteredBooks = allBooks.where((book) {
       final title = book.title.toLowerCase();
-      return queryWords.every((word) => title.contains(word));
+      final bookTopics = book.topics.split(', ');
+
+      bool matchesQuery = queryWords.every((word) => title.contains(word));
+      bool matchesTopics = topics == null ||
+          topics.isEmpty ||
+          topics.every((t) => bookTopics.contains(t));
+
+      return matchesQuery && matchesTopics;
     }).toList();
 
-    if (topics != null && topics.isNotEmpty) {
-      filteredBooks = filteredBooks
-          .where((book) =>
-              topics.every((t) => book.topics.split(', ').contains(t)))
-          .toList();
+    if (filteredBooks.isEmpty) {
+      return [];
     }
 
-    return Isolate.run(() {
-      filteredBooks.sort((a, b) {
-        final scoreA = ratio(query, a.title);
-        final scoreB = ratio(query, b.title);
-        return scoreB.compareTo(scoreA);
-      });
+    // Prepare data for isolate - only send what's needed for sorting
+    final List<Map<String, dynamic>> sortData = filteredBooks
+        .asMap()
+        .map((i, book) => MapEntry(i, {
+              'index': i,
+              'title': book.title,
+            }))
+        .values
+        .toList();
 
-      return filteredBooks;
-    });
+    // Sort indices in isolate
+    final sortedIndices = getSortedIndices(sortData, query);
+
+    // Map sorted indices back to books
+    return (await sortedIndices).map((index) => filteredBooks[index]).toList();
   }
 
   Future<void> createRefsFromLibrary(int startIndex) async {
     data.createRefsFromLibrary(await library, startIndex);
   }
 
-  addAllTextsToMimir({int start = 0, int end = 100000}) async {
-    data.addAllTextsToMimir(await library, start: start, end: end);
+  addAllTextsToTantivy({int start = 0, int end = 100000}) async {
+    data.addAllTextsToTantivy(await library, start: start, end: end);
   }
 
   Future<void> refreshLibrary() async {
@@ -486,3 +498,16 @@ class AppModel with ChangeNotifier {
 
 /// An enum that represents the different screens in the application.
 enum Screens { library, find, reading, search, favorites, settings }
+
+Future<List<int>> getSortedIndices(
+    List<Map<String, dynamic>> data, String query) async {
+  return await Isolate.run(() {
+    List<int> indices = List<int>.generate(data.length, (i) => i);
+    indices.sort((a, b) {
+      final scoreA = ratio(query, data[a]['title'] as String);
+      final scoreB = ratio(query, data[b]['title'] as String);
+      return scoreB.compareTo(scoreA);
+    });
+    return indices;
+  });
+}
diff --git a/lib/screens/full_text_search/full_text_settings_screen.dart b/lib/screens/full_text_search/full_text_settings_screen.dart
index 856e1d99..11543d07 100644
--- a/lib/screens/full_text_search/full_text_settings_screen.dart
+++ b/lib/screens/full_text_search/full_text_settings_screen.dart
@@ -86,7 +86,7 @@ class FullTextSettingsScreen extends StatelessWidget {
                                       ],
                                     ));
                             if (await result == true) {
-                              context.read<AppModel>().addAllTextsToMimir();
+                              context.read<AppModel>().addAllTextsToTantivy();
                             }
                           },
                           child: const Text(