diff --git a/src/public/app/services/tab_manager.js b/src/public/app/services/tab_manager.js
index c4159e82d..db0bfa2c3 100644
--- a/src/public/app/services/tab_manager.js
+++ b/src/public/app/services/tab_manager.js
@@ -336,4 +336,8 @@ export default class TabManager extends Component {
 
         this.triggerCommand('openInWindow', {notePath});
     }
+
+    hoistedNoteChangedEvent() {
+        this.tabsUpdate.scheduleUpdate();
+    }
 }
diff --git a/src/public/app/services/tree.js b/src/public/app/services/tree.js
index d3718249f..d29e2ee8a 100644
--- a/src/public/app/services/tree.js
+++ b/src/public/app/services/tree.js
@@ -37,8 +37,6 @@ async function resolveNotePathToSegments(notePath, logErrors = true) {
         path.push('root');
     }
 
-    const hoistedNoteId = hoistedNoteService.getHoistedNoteId();
-
     const effectivePath = [];
     let childNoteId = null;
     let i = 0;
@@ -91,10 +89,6 @@ async function resolveNotePathToSegments(notePath, logErrors = true) {
 
         effectivePath.push(parentNoteId);
         childNoteId = parentNoteId;
-
-        if (parentNoteId === hoistedNoteId) {
-            break;
-        }
     }
 
     return effectivePath.reverse();
diff --git a/src/routes/api/autocomplete.js b/src/routes/api/autocomplete.js
index ecdea6d0c..037a78b1d 100644
--- a/src/routes/api/autocomplete.js
+++ b/src/routes/api/autocomplete.js
@@ -38,7 +38,7 @@ function getRecentNotes(activeNoteId) {
     const hoistedNoteId = cls.getHoistedNoteId();
     if (hoistedNoteId !== 'root') {
         extraCondition = `AND recent_notes.notePath LIKE ?`;
-        params.push(hoistedNoteId + '%');
+        params.push('%' + hoistedNoteId + '%');
     }
 
     const recentNotes = repository.getEntities(`