diff --git a/lib/note_list.dart b/lib/note_list.dart
index 1d06340..3efcd59 100755
--- a/lib/note_list.dart
+++ b/lib/note_list.dart
@@ -40,6 +40,8 @@ class _NoteListScreenState extends State<NoteListScreen> {
   int _visibleLimit = 30;
   bool _isLoadingMore = false;
   Map<File, Set<String>> noteTags = {};
+  Map<File, String> _noteRelativePaths = {};
+  Map<File, String> _noteContentLower = {};
   String? notesDirectoryPath;
   String? defaultDir;
   bool _useExternalEditor = false;
@@ -239,7 +241,9 @@ Happy note taking! ✨
 
     List<File> allNotes = [];
     Map<String, DateTime> folderTimestamps = {};
-    Map<File, Set<String>> extractedTags = {}; // ✅ Store extracted tags here
+    Map<File, Set<String>> extractedTags = {};
+    Map<File, String> extractedRelPaths = {};
+    Map<File, String> extractedContentLower = {};
 
     void fetchNotes(Directory dir) {
       final entries = dir.listSync(recursive: _includeSubdirectories);
@@ -261,6 +265,8 @@ Happy note taking! ✨
 
           final content = entry.readAsStringSync();
           extractedTags[entry] = _extractTags(content);
+          extractedRelPaths[entry] = path.relative(entry.path, from: notesDirectoryPath!).toLowerCase();
+          extractedContentLower[entry] = content.toLowerCase();
         }
       }
     }
@@ -286,7 +292,9 @@ Happy note taking! ✨
     setState(() {
       notes = allNotes;
       filteredNotes = allNotes;
-      noteTags = extractedTags; // ✅ Update stored tags
+      noteTags = extractedTags;
+      _noteRelativePaths = extractedRelPaths;
+      _noteContentLower = extractedContentLower;
     });
 
     _filterNotes(); // ✅ Apply search immediately if a term is active
@@ -329,15 +337,12 @@ Happy note taking! ✨
       final normalizedSearch = searchText.replaceFirst(RegExp(r'^/'), '');
 
       filteredNotes = notes.where((note) {
-        final relativePath = path.relative(note.path, from: notesDirectoryPath!).toLowerCase();
-        final noteTags = _extractTags(note.readAsStringSync());
+        final relativePath = _noteRelativePaths[note] ?? '';
+        final tags = noteTags[note] ?? {};
+        final content = _includeFileContent ? (_noteContentLower[note] ?? '') : '';
 
-        // ✅ Read file content ONLY if `Include File Content` is enabled
-        final content = _includeFileContent ? note.readAsStringSync().toLowerCase() : '';
-
-        // ✅ Match partial tags instead of requiring full matches (case-insensitive)
         final matchesTags = searchTags.every((tag) =>
-            noteTags.any((noteTag) => noteTag.toLowerCase().startsWith(tag)));
+            tags.any((noteTag) => noteTag.toLowerCase().startsWith(tag)));
 
         if (!_includeFileContent) {
           return relativePath.contains(normalizedSearch) && matchesTags;
@@ -439,13 +444,17 @@ Happy note taking! ✨
       }
 
       if (!newNote.existsSync()) {
-        newNote.writeAsStringSync('# $safeTitle\n\n');
+        final newContent = '# $safeTitle\n\n';
+        newNote.writeAsStringSync(newContent);
         setState(() {
           notes.add(newNote);
           filteredNotes.add(newNote);
+          noteTags[newNote] = {};
+          _noteRelativePaths[newNote] = path.relative(newNote.path, from: notesDirectoryPath!).toLowerCase();
+          _noteContentLower[newNote] = newContent.toLowerCase();
         });
 
-        Navigator.push(
+        await Navigator.push(
           context,
           MaterialPageRoute(
             builder: (context) => NoteEditorScreen(
@@ -456,6 +465,7 @@ Happy note taking! ✨
             ),
           ),
         );
+        if (context.mounted) _loadNotes();
       }
     } catch (e) {
       ScaffoldMessenger.of(context).showSnackBar(