diff --git a/db/migrations/0198__NOOP.js b/db/migrations/0198__NOOP.js
deleted file mode 100644
index c77dd19b6..000000000
--- a/db/migrations/0198__NOOP.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = () => console.log("NOOP, increased because of new note type");
diff --git a/db/migrations/0198__create_hidden_subtree.js b/db/migrations/0198__create_hidden_subtree.js
new file mode 100644
index 000000000..5e84d1024
--- /dev/null
+++ b/db/migrations/0198__create_hidden_subtree.js
@@ -0,0 +1,10 @@
+module.exports = () => {
+    const specialNotesService = require('../../src/services/special_notes');
+    const cls = require("../../src/services/cls");
+    const beccaLoader = require("../../src/becca/becca_loader");
+
+    cls.init(() => {
+        beccaLoader.load();
+        specialNotesService.getHiddenRoot();
+    });
+};
diff --git a/db/migrations/0199_move_share_under_hidden.sql b/db/migrations/0199__move_share_under_hidden.sql
similarity index 100%
rename from db/migrations/0199_move_share_under_hidden.sql
rename to db/migrations/0199__move_share_under_hidden.sql
diff --git a/db/migrations/0200__move_global_note_map_under_hidden.sql b/db/migrations/0200__move_global_note_map_under_hidden.sql
new file mode 100644
index 000000000..3c457e2c3
--- /dev/null
+++ b/db/migrations/0200__move_global_note_map_under_hidden.sql
@@ -0,0 +1 @@
+UPDATE branches SET parentNoteId = 'hidden' WHERE noteId = 'globalnotemap';
diff --git a/db/migrations/0201__set_branch_id_in_hidden_subtree.sql b/db/migrations/0201__set_branch_id_in_hidden_subtree.sql
new file mode 100644
index 000000000..10f3f3ce0
--- /dev/null
+++ b/db/migrations/0201__set_branch_id_in_hidden_subtree.sql
@@ -0,0 +1,3 @@
+UPDATE branches SET branchId = 'search' WHERE parentNoteId = 'hidden' AND noteId = 'search';
+UPDATE branches SET branchId = 'globalnotemap' WHERE parentNoteId = 'hidden' AND noteId = 'globalnotemap';
+UPDATE branches SET branchId = 'sqlconsole' WHERE parentNoteId = 'hidden' AND noteId = 'sqlconsole';
diff --git a/db/migrations/0202__delete_singles_special_note.sql b/db/migrations/0202__delete_singles_special_note.sql
new file mode 100644
index 000000000..817d6fcc8
--- /dev/null
+++ b/db/migrations/0202__delete_singles_special_note.sql
@@ -0,0 +1,6 @@
+DELETE FROM branches WHERE noteId = 'singles';
+DELETE FROM notes WHERE noteId = 'singles';
+DELETE FROM note_contents WHERE noteId = 'singles';
+DELETE FROM note_revisions WHERE noteId = 'singles';
+DELETE FROM attributes WHERE noteId = 'singles';
+DELETE FROM entity_changes WHERE entityId = 'singles';
diff --git a/src/services/app_info.js b/src/services/app_info.js
index 80d1c4cde..f9f73d368 100644
--- a/src/services/app_info.js
+++ b/src/services/app_info.js
@@ -4,7 +4,7 @@ const build = require('./build');
 const packageJson = require('../../package');
 const {TRILIUM_DATA_DIR} = require('./data_dir');
 
-const APP_DB_VERSION = 199;
+const APP_DB_VERSION = 202;
 const SYNC_VERSION = 27;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index 0731989c1..2b3b344e0 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -140,7 +140,7 @@ class ConsistencyChecks {
             });
 
         this.findAndFixIssues(`
-                    SELECT branchId, branches.noteId AS parentNoteId
+                    SELECT branchId, branches.parentNoteId AS parentNoteId
                     FROM branches
                       LEFT JOIN notes ON notes.noteId = branches.parentNoteId
                     WHERE branches.isDeleted = 0
diff --git a/src/services/special_notes.js b/src/services/special_notes.js
index 780465c23..c5b7c66b7 100644
--- a/src/services/special_notes.js
+++ b/src/services/special_notes.js
@@ -56,6 +56,7 @@ function getSearchRoot() {
 
     if (!searchRoot) {
         searchRoot = noteService.createNewNote({
+            branchId: 'search',
             noteId: 'search',
             title: 'search',
             type: 'text',
@@ -67,32 +68,17 @@ function getSearchRoot() {
     return searchRoot;
 }
 
-function getSinglesNoteRoot() {
-    let singlesNoteRoot = becca.getNote('singles');
-
-    if (!singlesNoteRoot) {
-        singlesNoteRoot = noteService.createNewNote({
-            noteId: 'singles',
-            title: 'singles',
-            type: 'text',
-            content: '',
-            parentNoteId: getHiddenRoot().noteId
-        }).note;
-    }
-
-    return singlesNoteRoot;
-}
-
 function getGlobalNoteMap() {
     let globalNoteMap = becca.getNote('globalnotemap');
 
     if (!globalNoteMap) {
         globalNoteMap = noteService.createNewNote({
+            branchId: 'globalnotemap',
             noteId: 'globalnotemap',
             title: 'Global Note Map',
             type: 'note-map',
             content: '',
-            parentNoteId: getSinglesNoteRoot().noteId
+            parentNoteId: getHiddenRoot().noteId
         }).note;
 
         globalNoteMap.addLabel('mapRootNoteId', 'hoisted');
@@ -106,6 +92,7 @@ function getSqlConsoleRoot() {
 
     if (!sqlConsoleRoot) {
         sqlConsoleRoot = noteService.createNewNote({
+            branchId: 'sqlconsole',
             noteId: 'sqlconsole',
             title: 'SQL Console',
             type: 'text',
@@ -332,7 +319,6 @@ const shortcuts = [
 ];
 
 function createMissingSpecialNotes() {
-    getSinglesNoteRoot();
     getSqlConsoleRoot();
     getGlobalNoteMap();
     getBulkActionNote();
@@ -450,6 +436,7 @@ module.exports = {
     saveSearchNote,
     createMissingSpecialNotes,
     getShareRoot,
+    getHiddenRoot,
     getBulkActionNote,
     createShortcut
 };