diff --git a/public/javascripts/note_tree.js b/public/javascripts/note_tree.js
index 16dfb94c7..5ed133f7d 100644
--- a/public/javascripts/note_tree.js
+++ b/public/javascripts/note_tree.js
@@ -22,6 +22,8 @@ const noteTree = (function() {
     }
 
     function prepareNoteTree() {
+        glob.allNoteIds = Object.keys(notesMap);
+
         return prepareNoteTreeInner(parentToNotes['root']);
     }
 
@@ -31,8 +33,6 @@ const noteTree = (function() {
         for (const noteId of noteIds) {
             const note = notesMap[noteId];
 
-            glob.allNoteIds.push(note.note_id);
-
             note.title = note.note_title;
 
             if (note.is_protected) {
@@ -277,6 +277,10 @@ const noteTree = (function() {
         tree.clearFilter();
     }
 
+    function getByNoteId(noteId) {
+        return notesMap[noteId];
+    }
+
     $("button#reset-search-button").click(resetSearch);
 
     $("input[name=search]").keyup(e => {
@@ -310,5 +314,6 @@ const noteTree = (function() {
         collapseTree,
         scrollToCurrentNote,
         toggleSearch,
+        getByNoteId
     };
 })();
\ No newline at end of file
diff --git a/public/javascripts/tree_utils.js b/public/javascripts/tree_utils.js
index b3993fdaa..7981f63ed 100644
--- a/public/javascripts/tree_utils.js
+++ b/public/javascripts/tree_utils.js
@@ -37,7 +37,7 @@ const treeUtils = (function() {
     }
 
     function getFullName(noteId) {
-        let note = treeUtils.getNodeByKey(noteId);
+        let note = noteTree.getByNoteId(noteId);
 
         if (note === null) {
             return "[unknown]";
@@ -46,14 +46,11 @@ const treeUtils = (function() {
         const path = [];
 
         while (note) {
-            path.push(note.title);
+            path.push(note.note_title);
 
-            note = note.getParent();
+            note = noteTree.getByNoteId(note.note_pid);
         }
 
-        // remove "root" element
-        path.pop();
-
         return path.reverse().join(" > ");
     }
 
diff --git a/public/javascripts/utils.js b/public/javascripts/utils.js
index b231344b8..a1178c806 100644
--- a/public/javascripts/utils.js
+++ b/public/javascripts/utils.js
@@ -34,27 +34,11 @@ function getAutocompleteItems(noteIds) {
         }
     }
 
+    autocompleteItems.sort((a, b) => a.value < b.value ? -1 : 1);
+
     return autocompleteItems;
 }
 
-function uint8ToBase64(u8Arr) {
-    const CHUNK_SIZE = 0x8000; //arbitrary number
-    const length = u8Arr.length;
-    let index = 0;
-    let result = '';
-    let slice;
-    while (index < length) {
-        slice = u8Arr.subarray(index, Math.min(index + CHUNK_SIZE, length));
-        result += String.fromCharCode.apply(null, slice);
-        index += CHUNK_SIZE;
-    }
-    return btoa(result);
-}
-
-function base64ToUint8Array(base64encoded) {
-    return new Uint8Array(atob(base64encoded).split("").map(c => c.charCodeAt(0)));
-}
-
 function getDateFromTS(timestamp) {
     // Date accepts number of milliseconds since epoch so UTC timestamp works without any extra handling
     // see https://stackoverflow.com/questions/4631928/convert-utc-epoch-to-local-date-with-javascript