diff --git a/TODO b/TODO
index 90c5dead7..9a8baa956 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 - new icon
 - polish becca entities API
 - separate private and public APIs in becca entities
+- what to do with calendar, edited_notes and what_links_here?
diff --git a/package-lock.json b/package-lock.json
index b130394da..828338ba4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8508,9 +8508,9 @@
       }
     },
     "ws": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz",
-      "integrity": "sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz",
+      "integrity": "sha512-lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="
     },
     "xdg-basedir": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index cebfdaffb..c85673634 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "tmp": "^0.2.1",
     "turndown": "7.1.1",
     "unescape": "1.0.1",
-    "ws": "7.5.1",
+    "ws": "7.5.2",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
diff --git a/src/public/app/widgets/collapsible_widgets/note_revisions.js b/src/public/app/widgets/collapsible_widgets/note_revisions.js
deleted file mode 100644
index 2f915086e..000000000
--- a/src/public/app/widgets/collapsible_widgets/note_revisions.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import server from "../../services/server.js";
-import CollapsibleWidget from "../collapsible_widget.js";
-
-const TPL = `
-<ul class="note-revision-list" style="max-height: 150px; overflow: auto;">
-</ul>
-`;
-
-class NoteRevisionsWidget extends CollapsibleWidget {
-    isEnabled() {
-        return super.isEnabled() && !this.note.hasLabel('noteRevisionsWidgetDisabled');
-    }
-
-    get widgetTitle() { return "Note revisions"; }
-
-    get help() {
-        return {
-            title: "Note revisions track changes in the note across the time.",
-            url: "https://github.com/zadam/trilium/wiki/Note-revisions"
-        };
-    }
-
-    get headerActions() {
-        const $showFullButton = $("<a>")
-            .addClass("bx bx-list-ul")
-            .addClass('widget-header-action')
-            .attr('title', 'Show Note revisions dialog');
-        
-        $showFullButton.on('click', async () => {
-            const attributesDialog = await import("../../dialogs/note_revisions.js");
-            attributesDialog.showCurrentNoteRevisions(this.noteId);
-        });
-
-        return [$showFullButton];
-    }
-
-    noteSwitched() {
-        const noteId = this.noteId;
-
-        // avoid executing this expensive operation multiple times when just going through notes (with keyboard especially)
-        // until the users settles on a note
-        setTimeout(() => {
-            if (this.noteId === noteId) {
-                this.refresh();
-            }
-        }, 1000);
-    }
-
-    async refreshWithNote(note) {
-        const revisionItems = await server.get(`notes/${note.noteId}/revisions`);
-
-        if (revisionItems.length === 0) {
-            this.$body.text("No revisions yet...");
-            return;
-        }
-
-        const groupedRevisionItems = this.getGroupedRevisionItems(revisionItems);
-
-        if (note.noteId !== this.noteId) {
-            return;
-        }
-
-        this.$body.html(TPL);
-
-        const $list = this.$body.find('.note-revision-list');
-
-        for (const [date, items] of groupedRevisionItems) {
-            const $listItem = $('<li>').append($("<strong>").text(date + ": "));
-            const revsWithinADay = [];
-
-            for (const item of items) {
-                const $rev = $("<span>");
-
-
-                $rev.append($("<a>", {
-                        'data-action': 'note-revision',
-                        'data-note-path': note.noteId,
-                        'data-note-revision-id': item.noteRevisionId,
-                        title: 'This revision was last edited on ' + item.dateLastEdited,
-                        href: 'javascript:'
-                    })
-                    .text(item.dateLastEdited.substr(11, 5)));
-
-                revsWithinADay.push($rev.html());
-            }
-
-            $listItem.append(revsWithinADay.join(", "));
-            $list.append($listItem);
-        }
-    }
-
-    getGroupedRevisionItems(revisionItems) {
-        const grouped = new Map(); // map preserves order of insertion
-
-        for (const item of revisionItems) {
-            const [date] = item.dateLastEdited.substr(0, 16).split(" ");
-
-            if (!grouped.has(date)) {
-                grouped.set(date, []);
-            }
-
-            grouped.get(date).push(item);
-        }
-
-        return grouped;
-    }
-
-    entitiesReloadedEvent({loadResults}) {
-        if (loadResults.hasNoteRevisionForNote(this.noteId)) {
-            this.refresh();
-        }
-    }
-}
-
-export default NoteRevisionsWidget;
diff --git a/src/public/app/widgets/quick_search.js b/src/public/app/widgets/quick_search.js
index 30c852050..03087b151 100644
--- a/src/public/app/widgets/quick_search.js
+++ b/src/public/app/widgets/quick_search.js
@@ -136,6 +136,8 @@ export default class QuickSearchWidget extends BasicWidget {
     async showInFullSearch() {
         const searchNote = await dateNotesService.createSearchNote({searchString: this.$searchString.val()});
 
+        await froca.loadSearchNote(searchNote.noteId);
+
         await appContext.tabManager.getActiveContext().setNote(searchNote.noteId);
     }