diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
index d0d759ad68..898b9e4915 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
@@ -74,9 +74,9 @@ public class AddContentTagAction extends AddTagAction {
          * We don't want VirtualFile and DerivedFile objects to be tagged.
          */
         final Collection<AbstractFile> selectedFiles = new HashSet<>();
-        selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(FsContent.class)));
-        selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(LayoutFile.class)));
-        selectedFiles.addAll(new HashSet<>(Utilities.actionsGlobalContext().lookupAll(LocalFile.class)));
+        selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(FsContent.class));
+        selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(LayoutFile.class));
+        selectedFiles.addAll(Utilities.actionsGlobalContext().lookupAll(LocalFile.class));
 
         new Thread(() -> {
             for (AbstractFile file : selectedFiles) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
index 624ca05633..f2971e07e9 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultTopComponent.java
@@ -109,8 +109,8 @@ public class DataResultTopComponent extends TopComponent implements DataResult,
 
         setTitle(title); // set the title
         setName(title);
-        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag");
-        getActionMap().put("addBookmarkTag", new BookmarkFileAction());
+        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag"); //NON-NLS
+        getActionMap().put("addBookmarkTag", new BookmarkFileAction()); //NON-NLS
 
         putClientProperty(TopComponent.PROP_CLOSING_DISABLED, isMain); // set option to close compoment in GUI
         putClientProperty(TopComponent.PROP_MAXIMIZATION_DISABLED, true);
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
index bd72a08da1..d7714a1646 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/TimeLineTopComponent.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.timeline;
 
+import java.awt.event.InputEvent;
 import java.beans.PropertyVetoException;
 import java.util.Collections;
 import java.util.List;
@@ -35,6 +36,8 @@ import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import org.controlsfx.control.Notifications;
 import org.joda.time.Interval;
@@ -49,6 +52,7 @@ import org.openide.windows.Mode;
 import org.openide.windows.TopComponent;
 import static org.openide.windows.TopComponent.PROP_UNDOCKING_DISABLED;
 import org.openide.windows.WindowManager;
+import org.sleuthkit.autopsy.actions.BookmarkFileAction;
 import org.sleuthkit.autopsy.corecomponents.DataContentPanel;
 import org.sleuthkit.autopsy.corecomponents.DataResultPanel;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -200,6 +204,9 @@ public final class TimeLineTopComponent extends TopComponent implements Explorer
         setToolTipText(NbBundle.getMessage(TimeLineTopComponent.class, "HINT_TimeLineTopComponent"));
         setIcon(WindowManager.getDefault().getMainWindow().getIconImage()); //use the same icon as main application
 
+        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_B, InputEvent.CTRL_MASK), "addBookmarkTag"); //NON-NLS
+        getActionMap().put("addBookmarkTag", new BookmarkFileAction()); //NON-NLS
+
         this.controller = controller;
 
         //create linked result and content views
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
index 7ac2200ae9..d598a488ae 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java
@@ -225,7 +225,7 @@ public class DrawableTagsManager {
                 try {
                     return autopsyTagsManager.addTagName(displayName);
                 } catch (TagsManager.TagNameAlreadyExistsException ex) {
-                    throw new TskCoreException("tagame exists but wasn't found", ex);
+                    throw new TskCoreException("tag name exists but wasn't found", ex);
                 }
             } catch (NullPointerException | IllegalStateException ex) {
                 LOGGER.log(Level.SEVERE, "Case was closed out from underneath", ex); //NON-NLS