diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InstanceDataSourceNode.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InstanceDataSourceNode.java
index adfec49714..59a04df0ee 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InstanceDataSourceNode.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InstanceDataSourceNode.java
@@ -19,9 +19,7 @@
  */
 package org.sleuthkit.autopsy.commonfilesearch;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
index 520749c658..0b851b614f 100644
--- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/commonfilesearch/InterCaseSearchResultsProcessor.java
@@ -265,7 +265,6 @@ final class InterCaseSearchResultsProcessor {
 //        private CommonAttributeValue commonAttributeValue = null;
         String caseName = null;
         String dataSourceName = null;
-        private String previousRowValue = "";
 
         @Override
         public void process(ResultSet resultSet) {
@@ -273,9 +272,6 @@ final class InterCaseSearchResultsProcessor {
                 while (resultSet.next()) {
                     int resultId = InstanceTableCallback.getId(resultSet);
                     String corValue = InstanceTableCallback.getValue(resultSet);
-                    if (previousRowValue.isEmpty()) {
-                        previousRowValue = corValue;
-                    }
                     if (corValue == null || HashUtility.isNoDataMd5(corValue)) {
                         continue;
                     }
@@ -295,7 +291,9 @@ final class InterCaseSearchResultsProcessor {
                     searchResult.setCurrentAttributeInst(corrAttr);
                     CommonAttributeValue commonAttributeValue = new CommonAttributeValue(corValue);
                     commonAttributeValue.addInstance(searchResult);
-                    valueList.addMetadataToList(new CommonAttributeValue(corValue));
+                    valueList.addMetadataToList(commonAttributeValue);
+                    dataSourceToFile.put(dataSourceName,valueList);
+                    caseCollatedDataSourceCollections.put(caseName, dataSourceToFile);
                 }
             } catch (EamDbException | SQLException ex) {
                 LOGGER.log(Level.WARNING, "Error getting artifact instances from database.", ex); // NON-NLS