diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
index 046ad0ed7..1f8b4b94b 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
@@ -41,6 +41,10 @@ export default function(event) {
 
     for (let i = 0; i < toolData.data.length; i++) {
         const data = toolData.data[i];
+        if (data.visible === false) {
+          continue;
+        }
+
         const { start, end, perpendicularStart, perpendicularEnd, textBox } = data.handles;
         const strokeWidth = lineWidth;
 
diff --git a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
index 860c13efd..1f04e2a77 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
@@ -272,6 +272,9 @@ function onImageRendered(e) {
 
     for (let i = 0; i < toolData.data.length; i++) {
         const data = toolData.data[i];
+        if (data.visible === false) {
+          continue;
+        }
 
         context.save();
 
diff --git a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
index 0e1bf15dc..33b290766 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
@@ -273,6 +273,9 @@ function createQualitativeTargetTool(toolType, responseText='') {
 
         for (let i = 0; i < toolData.data.length; i++) {
             const data = toolData.data[i];
+            if (data.visible === false) {
+              continue;
+            }
 
             context.save();
 
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index 8b7ba3045..8847e75bc 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -59,7 +59,7 @@ Meteor.startup(function() {
         previousPanel: 'LEFT',
 
         // Miscellaneous hotkeys
-        toggleOverlayTags: 'SHIFT',
+        toggleOverlayTags: 'O',
         toggleCinePlay: 'SPACE',
         toggleCineDialog: '',
         toggleDownloadDialog: '',
@@ -205,7 +205,7 @@ Meteor.startup(function() {
     // Register miscellaneous commands
     OHIF.commands.set(contextName, {
         toggleOverlayTags: {
-            name: 'Toggle Image Annotations',
+            name: 'Toggle Image Info Overlay',
             action() {
                 const $dicomTags = $('.imageViewerViewportOverlay .dicomTag');
                 $dicomTags.toggle($dicomTags.eq(0).css('display') === 'none');