diff --git a/Core/src/org/sleuthkit/autopsy/discovery/search/DiscoveryKeyUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/search/DiscoveryKeyUtils.java
index 7d4bed0011..6d7b763c7d 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/search/DiscoveryKeyUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/search/DiscoveryKeyUtils.java
@@ -953,7 +953,7 @@ public class DiscoveryKeyUtils {
         MostRecentActivityDateGroupKey(Result result) {
             if (result instanceof ResultDomain) {
                 epochDate = ((ResultDomain) result).getActivityEnd();
-                dateNameString = new SimpleDateFormat("yyyy/MM/dd").format(new Date(TimeUnit.SECONDS.toMillis(epochDate)));
+                dateNameString = new SimpleDateFormat("yyyy/MM/dd", Locale.getDefault()).format(new Date(TimeUnit.SECONDS.toMillis(epochDate)));
             } else {
                 epochDate = Long.MAX_VALUE;
                 dateNameString = Bundle.DiscoveryKeyUtils_MostRecentActivityDateGroupKey_noDate();
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED
index 48f0a1aab7..fb85b8a049 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/Bundle.properties-MERGED
@@ -1,3 +1,4 @@
+ArtifactTypeFilterPanel.selectionNeeded.text=At least one Result type must be selected.
 CTL_OpenDiscoveryAction=Discovery
 # {0} - dataSourceName
 DataSourceModuleWrapper.exifModule.text=Exif Parser module was not run on data source: {0}\n
@@ -7,6 +8,8 @@ DataSourceModuleWrapper.fileTypeModule.text=File Type Identification module was
 DataSourceModuleWrapper.hashModule.text=Hash Lookup module was not run on data source: {0}\n
 # {0} - timeZone
 DateFilterPanel.dateRange.text=Date Range ({0}):
+DateFilterPanel.invalidRange.text=Range or Only Last must be selected
+DateFilterPanel.startOrEndNeeded.text=A start or end date must be specified to use the range filter
 DiscoveryDialog.name.text=Discovery
 DiscoveryTopComponent.cancelButton.text=Cancel Search
 DiscoveryTopComponent.name=\ Discovery
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryPanel.java
index cb29bff5cc..5aa269eeb4 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryPanel.java
@@ -24,6 +24,7 @@ import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JList;
@@ -38,8 +39,7 @@ class DomainSummaryPanel extends javax.swing.JPanel implements ListCellRenderer<
 
     private static final long serialVersionUID = 1L;
     private static final Color SELECTION_COLOR = new Color(0, 120, 215);
-    private static final int MAX_NAME_STRING = 90;
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd yyyy");
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("MMM dd yyyy", Locale.getDefault());
 
     /**
      * Creates new form DomainPanel.
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.form b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.form
index 9f1e3516b9..22296c0178 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.form
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.form
@@ -39,6 +39,8 @@
           </Properties>
           <AuxValues>
             <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;DomainWrapper&gt;"/>
+            <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+            <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
           </AuxValues>
         </Component>
       </SubComponents>
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.java b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.java
index 50f6c4df53..593ae49949 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ui/DomainSummaryViewer.java
@@ -56,7 +56,7 @@ public class DomainSummaryViewer extends javax.swing.JPanel {
     private void initComponents() {
 
         domainScrollPane = new javax.swing.JScrollPane();
-        domainList = new javax.swing.JList<>();
+        javax.swing.JList<DomainWrapper> domainList = new javax.swing.JList<>();
 
         setLayout(new java.awt.BorderLayout());
 
@@ -69,7 +69,6 @@ public class DomainSummaryViewer extends javax.swing.JPanel {
 
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JList<DomainWrapper> domainList;
     private javax.swing.JScrollPane domainScrollPane;
     // End of variables declaration//GEN-END:variables