diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
index 6579b15e08..9aa77e19a0 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java
@@ -922,7 +922,7 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
      * Used as a key to ensure we eliminate duplicates from the result set by
      * not overwriting CR correlation instances.
      */
-    static final class UniquePathKey {
+    private static final class UniquePathKey {
 
         private final String dataSourceID;
         private final String filePath;
@@ -943,9 +943,9 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
         public boolean equals(Object other) {
             if (other instanceof UniquePathKey) {
                 UniquePathKey otherKey = (UniquePathKey) (other);
-                return (Objects.equals(otherKey.dataSourceID, this.dataSourceID)
-                        && Objects.equals(otherKey.filePath, this.filePath)
-                        && Objects.equals(otherKey.type, this.type));
+                return (Objects.equals(otherKey.getDataSourceID(), this.getDataSourceID())
+                        && Objects.equals(otherKey.getFilePath(), this.getFilePath())
+                        && Objects.equals(otherKey.getType(), this.getType()));
             }
             return false;
         }
@@ -955,7 +955,34 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
             //int hash = 7;
             //hash = 67 * hash + this.dataSourceID.hashCode();
             //hash = 67 * hash + this.filePath.hashCode();
-            return Objects.hash(dataSourceID, filePath, type);
+            return Objects.hash(getDataSourceID(), getFilePath(), getType());
+        }
+
+        /**
+         * Get the type of this UniquePathKey.
+         * 
+         * @return the type
+         */
+        String getType() {
+            return type;
+        }
+
+        /**
+         * Get the file path for the UniquePathKey.
+         * 
+         * @return the filePath
+         */
+        String getFilePath() {
+            return filePath;
+        }
+
+        /**
+         * Get the data source id for the UniquePathKey.
+         * 
+         * @return the dataSourceID
+         */
+        String getDataSourceID() {
+            return dataSourceID;
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
index 1f04f1f478..1a3527d940 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCasesTableModel.java
@@ -28,6 +28,8 @@ import org.openide.util.NbBundle.Messages;
  */
 public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
 
+    private static final long serialVersionUID = 1L;
+
     @Messages({"DataContentViewerOtherCasesTableModel.case=Case",
         "DataContentViewerOtherCasesTableModel.device=Device",
         "DataContentViewerOtherCasesTableModel.dataSource=Data Source",
@@ -66,7 +68,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
         }
     };
 
-    List<OtherOccurrenceNodeData> nodeDataList;
+    private final List<OtherOccurrenceNodeData> nodeDataList;
 
     DataContentViewerOtherCasesTableModel() {
         nodeDataList = new ArrayList<>();
@@ -118,7 +120,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
     /**
      * Map a column ID to the value in that cell for node message data.
      *
-     * @param nodeData    The node message data.
+     * @param nodeData The node message data.
      * @param columnId The ID of the cell column.
      *
      * @return The value in the cell.
@@ -133,7 +135,7 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
     /**
      * Map a column ID to the value in that cell for node instance data.
      *
-     * @param nodeData    The node instance data.
+     * @param nodeData The node instance data.
      * @param columnId The ID of the cell column.
      *
      * @return The value in the cell.