diff --git a/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
index 4f1799a309..66c9b04f4e 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/filequery/Bundle.properties-MERGED
@@ -58,7 +58,6 @@ FileSearchDialog.orderAttrRadioButton.text=Attribute
 FileSearchDialog.orderSizeRadioButton.text=Group Size
 FileSearchDialog.jLabel5.text=Order files by: 
 FileSearchDialog.parentCheckBox.text=Parent
-FileSearchDialog.searchButton.text=Search
 FileSearchFiltering.concatenateSetNamesForDisplay.comma=, 
 # {0} - Data source name
 # {1} - Data source ID
@@ -99,10 +98,10 @@ FileSearchFiltering.SizeFilter.or=\ or
 # {0} - Minimum bytes
 # {1} - Maximum bytes
 FileSearchFiltering.SizeFilter.range=({0} to {1})
-FileSearchPanel.dialogTitle.text=Test file search
 # {0} - tag names
 FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0}
 FileSearchFiltering.TagsFilter.or=\ or 
+FileSearchPanel.dialogTitle.text=Test file search
 FileSorter.SortingMethod.datasource.displayName=By data source
 FileSorter.SortingMethod.filename.displayName=By file name
 FileSorter.SortingMethod.filesize.displayName=By file size
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileDiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/filequery/FileDiscoveryDialog.java
index c36c724052..3b28c248ab 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileDiscoveryDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileDiscoveryDialog.java
@@ -113,7 +113,7 @@ class FileDiscoveryDialog extends javax.swing.JDialog {
             } else {
                 rightSplitPane.setTopComponent(tableViewer);
                 if (groupSelectedEvent.getFiles().size() > 0) {
-                    tableViewer.setNode(new TableFilterNode(new DataResultFilterNode(new AbstractNode(new SearchChildren(false, groupSelectedEvent.getFiles()))), true));
+                    tableViewer.setNode(new TableFilterNode(new SearchNode(groupSelectedEvent.getFiles()), true));
                 } else {
                     tableViewer.setNode(new TableFilterNode(new DataResultFilterNode(Node.EMPTY), true));
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/SearchChildren.java b/Core/src/org/sleuthkit/autopsy/filequery/SearchChildren.java
index 2046954642..a6053a30f2 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/SearchChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/SearchChildren.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,9 +30,9 @@ import org.sleuthkit.datamodel.AbstractFile;
 /**
  * Makes nodes for search results.
  */
-public class SearchChildren extends Children.Keys<AbstractFile> {
+class SearchChildren extends Children.Keys<AbstractFile> {
 
-    public SearchChildren(boolean lazy, List<AbstractFile> fileList) {
+    SearchChildren(boolean lazy, List<AbstractFile> fileList) {
         super(lazy);
         this.setKeys(fileList);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java b/Core/src/org/sleuthkit/autopsy/filequery/SearchNode.java
similarity index 86%
rename from Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
rename to Core/src/org/sleuthkit/autopsy/filequery/SearchNode.java
index e0f57b032d..464120a718 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/SearchNode.java
@@ -16,9 +16,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filesearch;
+package org.sleuthkit.autopsy.filequery;
 
-import org.sleuthkit.autopsy.filequery.SearchChildren;
 import java.util.List;
 import org.openide.nodes.AbstractNode;
 import org.openide.util.NbBundle;
@@ -28,11 +27,11 @@ import org.sleuthkit.datamodel.AbstractFile;
  *
  * @author jantonius
  */
-class SearchNode extends AbstractNode {
+public class SearchNode extends AbstractNode {
 
     private SearchChildren children;
 
-    SearchNode(List<AbstractFile> keys) {
+    public SearchNode(List<AbstractFile> keys) {
         super(new SearchChildren(true, keys));
         this.children = (SearchChildren) this.getChildren();
     }
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
index 06d2ef0b47..72aa48de48 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.filesearch;
 
+import org.sleuthkit.autopsy.filequery.SearchNode;
 import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.GridLayout;
@@ -67,7 +68,7 @@ class FileSearchPanel extends javax.swing.JPanel {
     /**
      * Creates new form FileSearchPanel
      */
-    public FileSearchPanel() {
+    FileSearchPanel() {
         initComponents();
         customizeComponents();