diff --git a/src/public/app/widgets/note_context_aware_widget.js b/src/public/app/widgets/note_context_aware_widget.js
index 372fb8a51..ef6c37ec7 100644
--- a/src/public/app/widgets/note_context_aware_widget.js
+++ b/src/public/app/widgets/note_context_aware_widget.js
@@ -1,5 +1,4 @@
 import BasicWidget from "./basic_widget.js";
-import appContext from "../services/app_context.js";
 
 export default class NoteContextAwareWidget extends BasicWidget {
     isNoteContext(ntxId) {
diff --git a/src/public/app/widgets/note_map.js b/src/public/app/widgets/note_map.js
index f147e2bfa..1aa21a266 100644
--- a/src/public/app/widgets/note_map.js
+++ b/src/public/app/widgets/note_map.js
@@ -117,15 +117,15 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
                 .linkCanvasObjectMode(() => "after");
         }
 
+        let mapRootNoteId = this.getMapRootNoteId();
+        const data = await this.loadNotesAndRelations(mapRootNoteId);
+        const nodeLinkRatio = data.nodes.length / data.links.length;
+
         this.graph.d3Force('link').distance(40);
         this.graph.d3Force('center').strength(0.01);
-        this.graph.d3Force('charge').strength(-30);
+        this.graph.d3Force('charge').strength(-20 / nodeLinkRatio);
         this.graph.d3Force('charge').distanceMax(1000);
 
-        let mapRootNoteId = this.getMapRootNoteId();
-
-        const data = await this.loadNotesAndRelations(mapRootNoteId);
-
         this.renderData(data);
     }
 
diff --git a/src/public/app/widgets/type_widgets/type_widget.js b/src/public/app/widgets/type_widgets/type_widget.js
index f1f6841c1..6c3376add 100644
--- a/src/public/app/widgets/type_widgets/type_widget.js
+++ b/src/public/app/widgets/type_widgets/type_widget.js
@@ -48,4 +48,15 @@ export default class TypeWidget extends NoteContextAwareWidget {
             this.focus();
         }
     }
+
+    // events should be propagated manually to the children widgets
+    handleEventInChildren(name, data) {
+        if (['activeContextChanged', 'setNoteContext'].includes(name)) {
+            // won't trigger .refresh();
+            return super.handleEventInChildren('setNoteContext', data);
+        }
+        else {
+            return Promise.resolve();
+        }
+    }
 }
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index a409cd6f6..9124630d9 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -9,7 +9,6 @@ const cls = require('./cls');
 const entityChangesService = require('./entity_changes');
 const optionsService = require('./options');
 const Branch = require('../becca/entities/branch');
-const dateUtils = require('./date_utils');
 const attributeService = require('./attributes');
 const noteRevisionService = require('./note_revisions');
 const becca = require("../becca/becca");