diff --git a/apps/mobile/src/screens/editor/Functions.js b/apps/mobile/src/screens/editor/Functions.js
index 4844dc110..cce6a9c32 100644
--- a/apps/mobile/src/screens/editor/Functions.js
+++ b/apps/mobile/src/screens/editor/Functions.js
@@ -625,12 +625,15 @@ export const _onMessage = async evt => {
         let _tag = JSON.parse(message.value);
         console.log(_tag.title);
         await db.notes.note(note.id).untag(_tag.title);
+
         useTagStore.getState().setTags();
-        Navigation.queueRoutesForUpdate([
-          Navigation.routeNames.Notes,
-          Navigation.routeNames.NotesPage,
-          Navigation.routeNames.Tags
-        ]);
+        Navigation.queueRoutesForUpdate(
+          'TaggedNotes',
+          'ColoredNotes',
+          'TopicNotes',
+          'Favorites',
+          'Notes'
+        );
       }
       break;
     case 'newtag':
@@ -732,11 +735,14 @@ async function addToCollection(id) {
       editing.actionAfterFirstSave = {
         type: null
       };
-      Navigation.queueRoutesForUpdate([
-        Navigation.routeNames.Notebooks,
-        Navigation.routeNames.TopicNotes,
-        Navigation.routeNames.Notebook
-      ]);
+      Navigation.queueRoutesForUpdate(
+        'TaggedNotes',
+        'ColoredNotes',
+        'TopicNotes',
+        'Favorites',
+        'Notes',
+        'Notebook'
+      );
       break;
     }
     case 'tag': {
@@ -744,10 +750,13 @@ async function addToCollection(id) {
       editing.actionAfterFirstSave = {
         type: null
       };
-      Navigation.queueRoutesForUpdate([
-        Navigation.routeNames.Tags,
-        Navigation.routeNames.TaggedNotes
-      ]);
+      Navigation.queueRoutesForUpdate(
+        'TaggedNotes',
+        'ColoredNotes',
+        'TopicNotes',
+        'Favorites',
+        'Notes'
+      );
       eSendEvent('updateTags');
       break;
     }
@@ -757,7 +766,13 @@ async function addToCollection(id) {
       editing.actionAfterFirstSave = {
         type: null
       };
-      Navigation.queueRoutesForUpdate([Navigation.routeNames.ColoredNotes]);
+      Navigation.queueRoutesForUpdate(
+        'TaggedNotes',
+        'ColoredNotes',
+        'TopicNotes',
+        'Favorites',
+        'Notes'
+      );
       useMenuStore.getState().setColorNotes();
       break;
     }
@@ -821,12 +836,13 @@ export async function saveNote(title, _id, data, type, _sessionId, _historySessi
     if (!locked) {
       let noteId = await db.notes.add(noteData);
       if (!_id || saveCounter < 3) {
-        Navigation.queueRoutesForUpdate([
-          Navigation.routeNames.Notes,
-          Navigation.routeNames.Favorites,
-          Navigation.routeNames.NotesPage,
-          Navigation.routeNames.Notebook
-        ]);
+        Navigation.queueRoutesForUpdate(
+          'TaggedNotes',
+          'ColoredNotes',
+          'TopicNotes',
+          'Favorites',
+          'Notes'
+        );
       }
       if (!_id) {
         if (sessionId === _sessionId) id = noteId;
@@ -851,11 +867,13 @@ export async function saveNote(title, _id, data, type, _sessionId, _historySessi
       await db.vault.save(noteData);
     }
     if (sessionId === _sessionId) {
-      Navigation.queueRoutesForUpdate([
-        Navigation.routeNames.NotesPage,
-        Navigation.routeNames.Favorites,
-        Navigation.routeNames.Notes
-      ]);
+      Navigation.queueRoutesForUpdate(
+        'TaggedNotes',
+        'ColoredNotes',
+        'TopicNotes',
+        'Favorites',
+        'Notes'
+      );
 
       lastEditTime = n + 10;
       let n = db.notes.note(_id)?.data?.dateEdited;
diff --git a/apps/mobile/src/utils/functions.js b/apps/mobile/src/utils/functions.js
index 1aaea5028..317bf008d 100644
--- a/apps/mobile/src/utils/functions.js
+++ b/apps/mobile/src/utils/functions.js
@@ -45,7 +45,13 @@ export const deleteItems = async item => {
 
     await db.notes.delete(...ids);
 
-    Navigation.queueRoutesForUpdate([Navigation.routeNames.Notes, Navigation.routeNames.NotesPage]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes'
+    );
     eSendEvent(eClearEditor);
   }
   if (topics?.length > 0) {
@@ -55,10 +61,7 @@ export const deleteItems = async item => {
     }
 
     // layoutmanager.withAnimation(150);
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.Notebooks,
-      Navigation.routeNames.Notebook
-    ]);
+    Navigation.queueRoutesForUpdate('Notebook', 'Notebooks');
     useMenuStore.getState().setMenuPins();
     ToastEvent.show({
       heading: 'Topics deleted',
@@ -71,7 +74,14 @@ export const deleteItems = async item => {
     await db.notebooks.delete(...ids);
 
     //layoutmanager.withAnimation(150);
-    Navigation.queueRoutesForUpdate([Navigation.routeNames.Notebooks, Navigation.routeNames.Notes]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes',
+      'Notebooks'
+    );
     useMenuStore.getState().setMenuPins();
   }
 
@@ -94,14 +104,16 @@ export const deleteItems = async item => {
         await db.trash.restore(...ids);
 
         //layoutmanager.withAnimation(150);
-        Navigation.queueRoutesForUpdate([
-          Navigation.routeNames.Notebooks,
-          Navigation.routeNames.Notes,
-          Navigation.routeNames.Trash,
-          Navigation.routeNames.NotesPage,
-          Navigation.routeNames.Notebook,
-          Navigation.routeNames.Trash
-        ]);
+        Navigation.queueRoutesForUpdate(
+          'TaggedNotes',
+          'ColoredNotes',
+          'TopicNotes',
+          'Favorites',
+          'Notes',
+          'Notebook',
+          'Notebooks',
+          'Trash'
+        );
         useMenuStore.getState().setMenuPins();
         useMenuStore.getState().setColorNotes();
         ToastEvent.hide();
@@ -110,7 +122,7 @@ export const deleteItems = async item => {
     });
   }
   history.selectedItemsList = [];
-  Navigation.queueRoutesForUpdate([Navigation.routeNames.Trash]);
+  Navigation.queueRoutesForUpdate('Trash');
   useSelectionStore.getState().clearSelection(true);
   useMenuStore.getState().setMenuPins();
   useMenuStore.getState().setColorNotes();
diff --git a/apps/mobile/src/utils/hooks/useActions.js b/apps/mobile/src/utils/hooks/useActions.js
index 5b5232695..ce7031937 100644
--- a/apps/mobile/src/utils/hooks/useActions.js
+++ b/apps/mobile/src/utils/hooks/useActions.js
@@ -123,11 +123,13 @@ export const useActions = ({ close = () => {}, item }) => {
     if (!item.id) return;
     close();
     await db.notes.note(item.id).favorite();
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Favorites,
-      Navigation.routeNames.Notes
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes'
+    );
   }
 
   async function pinItem() {
@@ -142,7 +144,14 @@ export const useActions = ({ close = () => {}, item }) => {
       return;
     }
     await db[`${type}s`][type](item.id).pin();
-    Navigation.queueRoutesForUpdate([Navigation.routeNames.Notebooks, Navigation.routeNames.Notes]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes',
+      'Notebooks'
+    );
   }
 
   async function pinToNotifications() {
@@ -178,14 +187,14 @@ export const useActions = ({ close = () => {}, item }) => {
     if (!checkNoteSynced()) return;
     close();
     await db.trash.restore(item.id);
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.Tags,
-      Navigation.routeNames.Notes,
-      Navigation.routeNames.Notebooks,
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Favorites,
-      Navigation.routeNames.Trash
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes',
+      'Notebooks'
+    );
     let type = item.type === 'trash' ? item.itemType : item.type;
     ToastEvent.show({
       heading: type === 'note' ? 'Note restored from trash' : 'Notebook restored from trash',
@@ -299,11 +308,13 @@ export const useActions = ({ close = () => {}, item }) => {
       let note = db.notes.note(item.id).data;
       if (note.locked) {
         close();
-        Navigation.queueRoutesForUpdate([
-          Navigation.routeNames.NotesPage,
-          Navigation.routeNames.Favorites,
-          Navigation.routeNames.Notes
-        ]);
+        Navigation.queueRoutesForUpdate(
+          'TaggedNotes',
+          'ColoredNotes',
+          'TopicNotes',
+          'Favorites',
+          'Notes'
+        );
       }
     } catch (e) {
       close();
@@ -361,11 +372,14 @@ export const useActions = ({ close = () => {}, item }) => {
         await db.tags.rename(item.id, db.tags.sanitize(value));
         useTagStore.getState().setTags();
         useMenuStore.getState().setMenuPins();
-        Navigation.queueRoutesForUpdate([
-          Navigation.routeNames.Notes,
-          Navigation.routeNames.NotesPage,
-          Navigation.routeNames.Tags
-        ]);
+        Navigation.queueRoutesForUpdate(
+          'TaggedNotes',
+          'ColoredNotes',
+          'TopicNotes',
+          'Favorites',
+          'Notes',
+          'Tags'
+        );
       },
       input: true,
       defaultValue: alias,
@@ -407,11 +421,14 @@ export const useActions = ({ close = () => {}, item }) => {
         positivePress: async value => {
           await db.tags.remove(item.id);
           useTagStore.getState().setTags();
-          Navigation.queueRoutesForUpdate([
-            Navigation.routeNames.Notes,
-            Navigation.routeNames.NotesPage,
-            Navigation.routeNames.Tags
-          ]);
+          Navigation.queueRoutesForUpdate(
+            'TaggedNotes',
+            'ColoredNotes',
+            'TopicNotes',
+            'Favorites',
+            'Notes',
+            'Tags'
+          );
         },
         positiveText: 'Delete',
         positiveType: 'errorShade'
@@ -441,12 +458,15 @@ export const useActions = ({ close = () => {}, item }) => {
       .notebook(editing.actionAfterFirstSave.notebook)
       .topics.topic(editing.actionAfterFirstSave.id)
       .delete(item.id);
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.Notebooks,
-      Navigation.routeNames.Notes,
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Notebook
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes',
+      'Notebook',
+      'Notebooks'
+    );
     close();
   }
 
@@ -461,7 +481,7 @@ export const useActions = ({ close = () => {}, item }) => {
       negativeText: 'Cancel',
       positivePress: async () => {
         await db.trash.delete(item.id);
-        Navigation.queueRoutesForUpdate([Navigation.routeNames.Trash]);
+        Navigation.queueRoutesForUpdate('Trash');
         useSelectionStore.getState().setSelectionMode(false);
         ToastEvent.show({
           heading: 'Permanantly deleted items',
@@ -496,11 +516,13 @@ export const useActions = ({ close = () => {}, item }) => {
   async function toggleLocalOnly() {
     if (!checkNoteSynced()) return;
     db.notes.note(item.id).localOnly();
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Favorites,
-      Navigation.routeNames.Notes
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes'
+    );
     close();
   }
 
@@ -511,22 +533,26 @@ export const useActions = ({ close = () => {}, item }) => {
       useEditorStore.getState().setReadonly(current);
       tiny.call(EditorWebView, tiny.toogleReadMode(current ? 'readonly' : 'design'));
     }
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Favorites,
-      Navigation.routeNames.Notes
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes'
+    );
     close();
   };
 
   const duplicateNote = async () => {
     if (!checkNoteSynced()) return;
     await db.notes.note(item.id).duplicate();
-    Navigation.queueRoutesForUpdate([
-      Navigation.routeNames.NotesPage,
-      Navigation.routeNames.Favorites,
-      Navigation.routeNames.Notes
-    ]);
+    Navigation.queueRoutesForUpdate(
+      'TaggedNotes',
+      'ColoredNotes',
+      'TopicNotes',
+      'Favorites',
+      'Notes'
+    );
     close();
   };