diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form
index 38e9c012a0..5546e8eb9d 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form
+++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.form
@@ -72,6 +72,10 @@
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="toolBarPanel">
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+      </AuxValues>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
           <BorderConstraints direction="First"/>
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
index cf94829d0d..3efc4c870f 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/DiscoveryTopComponent.java
@@ -167,7 +167,7 @@ public final class DiscoveryTopComponent extends TopComponent {
         javax.swing.JSplitPane mainSplitPane = new javax.swing.JSplitPane();
         leftSplitPane = new javax.swing.JSplitPane();
         rightSplitPane = new javax.swing.JSplitPane();
-        toolBarPanel = new javax.swing.JPanel();
+        javax.swing.JPanel toolBarPanel = new javax.swing.JPanel();
         imagesButton = new javax.swing.JButton();
         videosButton = new javax.swing.JButton();
 
@@ -291,7 +291,6 @@ public final class DiscoveryTopComponent extends TopComponent {
     private javax.swing.JButton imagesButton;
     private javax.swing.JSplitPane leftSplitPane;
     private javax.swing.JSplitPane rightSplitPane;
-    private javax.swing.JPanel toolBarPanel;
     private javax.swing.JButton videosButton;
     // End of variables declaration//GEN-END:variables
 
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
index 89c7ae48af..0e44b9b5fc 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
@@ -1050,10 +1050,8 @@ class FileSearch {
                 EamDb centralRepoDb) throws FileSearchException {
             if (centralRepoDb == null) {
                 for (ResultFile file : files) {
-                    if (file.getFrequency() == Frequency.UNKNOWN) {
-                        if (file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) {
-                            file.setFrequency(Frequency.KNOWN);
-                        }
+                    if (file.getFrequency() == Frequency.UNKNOWN && file.getFirstInstance().getKnown() == TskData.FileKnown.KNOWN) {
+                        file.setFrequency(Frequency.KNOWN);
                     }
                 }
             } else {
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java
index abfd57b9bd..920f7983c1 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchFiltering.java
@@ -235,8 +235,8 @@ class FileSearchFiltering {
     static class ParentSearchTerm {
 
         private final String searchStr;
-        private final boolean isFullPath;
-        private final boolean isIncluded;
+        private final boolean fullPath;
+        private final boolean included;
 
         /**
          * Create the ParentSearchTerm object
@@ -249,8 +249,8 @@ class FileSearchFiltering {
          */
         ParentSearchTerm(String searchStr, boolean isFullPath, boolean isIncluded) {
             this.searchStr = searchStr;
-            this.isFullPath = isFullPath;
-            this.isIncluded = isIncluded;
+            this.fullPath = isFullPath;
+            this.included = isIncluded;
         }
 
         /**
@@ -297,17 +297,17 @@ class FileSearchFiltering {
         }
 
         /**
-         * @return the isFullPath
+         * @return the fullPath
          */
         boolean isFullPath() {
-            return isFullPath;
+            return fullPath;
         }
 
         /**
-         * @return the isIncluded
+         * @return the included
          */
         boolean isIncluded() {
-            return isIncluded;
+            return included;
         }
 
         /**
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form
index 0d60758f2e..ccfb608cd6 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.form
@@ -3,12 +3,18 @@
 <Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="parentPathButtonGroup">
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.ButtonGroup" name="orderGroupsByButtonGroup">
     </Component>
     <Component class="javax.swing.ButtonGroup" name="parentIncludeButtonGroup">
-    </Component>
-    <Component class="javax.swing.ButtonGroup" name="typeButtonGroup">
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+      </AuxValues>
     </Component>
   </NonVisualComponents>
   <Properties>
diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
index 94c4679de2..0437bd71e0 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearchPanel.java
@@ -728,10 +728,9 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
     private void initComponents() {
         java.awt.GridBagConstraints gridBagConstraints;
 
-        parentPathButtonGroup = new javax.swing.ButtonGroup();
+        javax.swing.ButtonGroup parentPathButtonGroup = new javax.swing.ButtonGroup();
         orderGroupsByButtonGroup = new javax.swing.ButtonGroup();
-        parentIncludeButtonGroup = new javax.swing.ButtonGroup();
-        typeButtonGroup = new javax.swing.ButtonGroup();
+        javax.swing.ButtonGroup parentIncludeButtonGroup = new javax.swing.ButtonGroup();
         filtersScrollPane = new javax.swing.JScrollPane();
         filtersPanel = new javax.swing.JPanel();
         sizeCheckbox = new javax.swing.JCheckBox();
@@ -1581,10 +1580,8 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
     private javax.swing.ButtonGroup orderGroupsByButtonGroup;
     private javax.swing.JLabel orderGroupsByLabel;
     private javax.swing.JCheckBox parentCheckbox;
-    private javax.swing.ButtonGroup parentIncludeButtonGroup;
     private javax.swing.JLabel parentLabel;
     private javax.swing.JList<ParentSearchTerm> parentList;
-    private javax.swing.ButtonGroup parentPathButtonGroup;
     private javax.swing.JScrollPane parentScrollPane;
     private javax.swing.JTextField parentTextField;
     private javax.swing.JCheckBox scoreCheckbox;
@@ -1599,7 +1596,6 @@ final class FileSearchPanel extends javax.swing.JPanel implements ActionListener
     private javax.swing.JCheckBox tagsCheckbox;
     private javax.swing.JList<TagName> tagsList;
     private javax.swing.JScrollPane tagsScrollPane;
-    private javax.swing.ButtonGroup typeButtonGroup;
     // End of variables declaration//GEN-END:variables
 
 }