diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index 38be797a22..93626ee62a 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -192,5 +192,5 @@ ViewPreferencesPanel.centralRepoLabel.text=Do not use Central Repository for:
 ViewPreferencesPanel.commentsOccurencesColumnsCheckbox.text=C(omments) and O(ccurences) columns to reduce loading times
 ViewPreferencesPanel.deletedFilesLimitCheckbox.text=Limit to 10,000
 ViewPreferencesPanel.deletedFilesLimitLabel.text=Limit number of deleted files displayed:
-ViewPreferencesPanel.fileDisplayLabel.text=Translate text in the:
 ViewPreferencesPanel.translateNamesRadioButton.text=Table
+ViewPreferencesPanel.translateTextLabel.text=Translate text in the:
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.form b/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.form
index 7b8f1e49b2..89ffab91d8 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.form
@@ -120,7 +120,7 @@
                                           </Group>
                                           <EmptySpace type="separate" max="-2" attributes="0"/>
                                           <Group type="103" groupAlignment="0" attributes="0">
-                                              <Component id="fileDisplayLabel" min="-2" max="-2" attributes="0"/>
+                                              <Component id="translateTextLabel" min="-2" max="-2" attributes="0"/>
                                               <Component id="displayTimeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                                               <Group type="102" alignment="0" attributes="0">
                                                   <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
@@ -177,7 +177,7 @@
                           </Group>
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" attributes="0">
-                              <Component id="fileDisplayLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="translateTextLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                               <Component id="hideOtherUsersTagsLabel" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
@@ -374,10 +374,10 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="translateNamesRadioButtonActionPerformed"/>
                   </Events>
                 </Component>
-                <Component class="javax.swing.JLabel" name="fileDisplayLabel">
+                <Component class="javax.swing.JLabel" name="translateTextLabel">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="ViewPreferencesPanel.fileDisplayLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                      <ResourceString bundle="org/sleuthkit/autopsy/corecomponents/Bundle.properties" key="ViewPreferencesPanel.translateTextLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                     </Property>
                   </Properties>
                 </Component>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.java
index 6f2a0ab68c..b96e97d133 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ViewPreferencesPanel.java
@@ -151,7 +151,7 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
         deletedFilesLimitCheckbox = new javax.swing.JCheckBox();
         deletedFilesLimitLabel = new javax.swing.JLabel();
         translateNamesRadioButton = new javax.swing.JRadioButton();
-        fileDisplayLabel = new javax.swing.JLabel();
+        translateTextLabel = new javax.swing.JLabel();
         currentCaseSettingsPanel = new javax.swing.JPanel();
         groupByDataSourceCheckbox = new javax.swing.JCheckBox();
         currentSessionSettingsPanel = new javax.swing.JPanel();
@@ -261,7 +261,7 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(fileDisplayLabel, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.fileDisplayLabel.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(translateTextLabel, org.openide.util.NbBundle.getMessage(ViewPreferencesPanel.class, "ViewPreferencesPanel.translateTextLabel.text")); // NOI18N
 
         javax.swing.GroupLayout globalSettingsPanelLayout = new javax.swing.GroupLayout(globalSettingsPanel);
         globalSettingsPanel.setLayout(globalSettingsPanelLayout);
@@ -299,7 +299,7 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
                                     .addComponent(hideOtherUsersTagsLabel))
                                 .addGap(18, 18, 18)
                                 .addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(fileDisplayLabel)
+                                    .addComponent(translateTextLabel)
                                     .addComponent(displayTimeLabel)
                                     .addGroup(globalSettingsPanelLayout.createSequentialGroup()
                                         .addGap(10, 10, 10)
@@ -344,7 +344,7 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
                         .addComponent(useGMTTimeRadioButton)))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(fileDisplayLabel)
+                    .addComponent(translateTextLabel)
                     .addComponent(hideOtherUsersTagsLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(globalSettingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
@@ -579,7 +579,6 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
     private javax.swing.JCheckBox deletedFilesLimitCheckbox;
     private javax.swing.JLabel deletedFilesLimitLabel;
     private javax.swing.JLabel displayTimeLabel;
-    private javax.swing.JLabel fileDisplayLabel;
     private javax.swing.JPanel globalSettingsPanel;
     private javax.swing.JCheckBox groupByDataSourceCheckbox;
     private javax.swing.JLabel hideKnownFilesLabel;
@@ -590,6 +589,7 @@ public class ViewPreferencesPanel extends JPanel implements OptionsPanel {
     private javax.swing.JRadioButton keepCurrentViewerRadioButton;
     private javax.swing.JLabel selectFileLabel;
     private javax.swing.JRadioButton translateNamesRadioButton;
+    private javax.swing.JLabel translateTextLabel;
     private javax.swing.JRadioButton useBestViewerRadioButton;
     private javax.swing.JRadioButton useGMTTimeRadioButton;
     private javax.swing.JRadioButton useLocalTimeRadioButton;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
index c9d4895068..5890fea0cf 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
@@ -22,7 +22,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.ref.WeakReference;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
@@ -370,7 +370,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
      * Creates and populates a list of properties for this nodes property sheet.
      */
     private List<NodeProperty<?>> getProperties() {
-        List<NodeProperty<?>> properties = new LinkedList<NodeProperty<?>>() {{
+        List<NodeProperty<?>> properties = new ArrayList<NodeProperty<?>>() {{
             add(new NodeProperty<>(NAME.toString(), NAME.toString(), NO_DESCR, getContentDisplayName(content)));   
             /*
              * Initialize dummy place holder properties for Translation,
@@ -576,7 +576,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
      * @return a list of tags that are associated with the file
      */
     List<ContentTag> getContentTagsFromDatabase() {
-        List<ContentTag> tags = new LinkedList<>();
+        List<ContentTag> tags = new ArrayList<>();
         try {
             tags.addAll(Case.getCurrentCaseThrows().getServices().getTagsManager().getContentTagsByContent(content));
         } catch (TskCoreException | NoCurrentCaseException ex) {