diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
index 54a7cda52d..70a5beb40e 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
@@ -56,7 +56,6 @@ final class DiscoveryTopComponent extends TopComponent {
     private final GroupListPanel groupListPanel;
     private final DataContentPanel dataContentPanel;
     private final ResultsPanel resultsPanel;
-    private final ExplorerManager explorerManager;
 
     /**
      * Creates new form FileDiscoveryDialog
@@ -74,10 +73,9 @@ final class DiscoveryTopComponent extends TopComponent {
             }
         }
         setName(Bundle.DiscoveryTopComponent_name());
-        explorerManager = new ExplorerManager();
         fileSearchPanel = new FileSearchPanel(Case.getCurrentCase().getSleuthkitCase(), centralRepoDb);
         dataContentPanel = DataContentPanel.createInstance();
-        resultsPanel = new ResultsPanel(explorerManager, centralRepoDb);
+        resultsPanel = new ResultsPanel(centralRepoDb);
         groupListPanel = new GroupListPanel();
         leftSplitPane.setLeftComponent(fileSearchPanel);
         leftSplitPane.setRightComponent(groupListPanel);
@@ -100,26 +98,6 @@ final class DiscoveryTopComponent extends TopComponent {
                 }
             }
         });
-        this.explorerManager.addPropertyChangeListener((evt) -> {
-            if (evt.getPropertyName().equals(ExplorerManager.PROP_SELECTED_NODES) && dataContentPanel != null) {
-                /*
-                 * Pass a single node selection in a result viewer to the
-                 * content view. Note that passing null to the content view
-                 * signals that either multiple nodes are selected, or a
-                 * previous selection has been cleared. This is important to the
-                 * content view, since its child content viewers only work for a
-                 * single node.
-                 */
-                Node[] selectedNodes = explorerManager.getSelectedNodes();
-                SwingUtilities.invokeLater(() -> {
-                    if (selectedNodes.length == 1) {
-                        dataContentPanel.setNode(selectedNodes[0]);
-                    } else {
-                        dataContentPanel.setNode(null);
-                    }
-                });
-            }
-        });
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
index b5655d650a..b0cc38fc52 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchData.java
@@ -286,7 +286,7 @@ class FileSearchData {
          * @return enums that can be used to filter
          */
         static List<FileType> getOptionsForFiltering() {
-            return Arrays.asList(IMAGE, AUDIO, VIDEO, EXECUTABLE, DOCUMENTS);
+            return Arrays.asList(IMAGE, VIDEO);
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
index fe2594073b..a5df38ecd3 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/ResultsPanel.java
@@ -50,7 +50,6 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class ResultsPanel extends javax.swing.JPanel {
 
     private static final long serialVersionUID = 1L;
-    private final DataResultViewerTable tableViewer;
     private final VideoThumbnailViewer videoThumbnailViewer;
     private final ImageThumbnailViewer imageThumbnailViewer;
     private List<FileSearchFiltering.FileFilter> searchFilters;
@@ -70,10 +69,9 @@ public class ResultsPanel extends javax.swing.JPanel {
     /**
      * Creates new form ResultsPanel.
      */
-    public ResultsPanel(ExplorerManager explorerManager, EamDb centralRepo) {
+    public ResultsPanel(EamDb centralRepo) {
         initComponents();
         this.centralRepo = centralRepo;
-        tableViewer = new DataResultViewerTable(explorerManager);
         imageThumbnailViewer = new ImageThumbnailViewer();
         videoThumbnailViewer = new VideoThumbnailViewer();
         videoThumbnailViewer.addListSelectionListener((e) -> {
@@ -162,15 +160,7 @@ public class ResultsPanel extends javax.swing.JPanel {
             } else if (pageRetrievedEvent.getType() == FileSearchData.FileType.VIDEO) {
                 populateVideoViewer(pageRetrievedEvent.getSearchResults());
                 resultsViewerPanel.add(videoThumbnailViewer);
-            } else {
-                resultsViewerPanel.add(tableViewer);
-                if (pageRetrievedEvent.getSearchResults().size() > 0) {
-                    List<AbstractFile> filesList = pageRetrievedEvent.getSearchResults().stream().map(file -> file.getFirstInstance()).collect(Collectors.toList());
-                    tableViewer.setNode(new TableFilterNode(new SearchNode(filesList), true));
-                } else {
-                    tableViewer.setNode(new TableFilterNode(new DataResultFilterNode(Node.EMPTY), true));
-                }
-            }
+            } 
             resultsViewerPanel.revalidate();
             resultsViewerPanel.repaint();
         }
@@ -183,8 +173,6 @@ public class ResultsPanel extends javax.swing.JPanel {
      */
     private synchronized void resetResultViewer() {
         resultsViewerPanel.remove(imageThumbnailViewer);
-        tableViewer.resetComponent();
-        resultsViewerPanel.remove(tableViewer);
         resultsViewerPanel.remove(videoThumbnailViewer);
 
         //cancel any unfished thumb workers
@@ -262,7 +250,6 @@ public class ResultsPanel extends javax.swing.JPanel {
             updateControls();
             videoThumbnailViewer.clearViewer();
             imageThumbnailViewer.clearViewer();
-            tableViewer.setNode(new TableFilterNode(new DataResultFilterNode(Node.EMPTY), true));
             resultsViewerPanel.revalidate();
             resultsViewerPanel.repaint();
         });