diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
index 33f69712f0..216eb3d21e 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java
@@ -34,15 +34,18 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.discovery.FileGroup.GroupSortingAlgorithm;
+import static org.sleuthkit.autopsy.discovery.FileGroup.GroupSortingAlgorithm.BY_GROUP_SIZE;
 import org.sleuthkit.autopsy.discovery.FileSearch.GroupingAttributeType;
+import static org.sleuthkit.autopsy.discovery.FileSearch.GroupingAttributeType.PARENT_PATH;
 import org.sleuthkit.autopsy.discovery.FileSorter.SortingMethod;
+import static org.sleuthkit.autopsy.discovery.FileSorter.SortingMethod.BY_FILE_NAME;
 
 /**
  * Dialog for displaying the controls and filters for configuration of a
  * Discovery search.
  */
 final class DiscoveryDialog extends javax.swing.JDialog {
-
+    
     private static final Set<Case.Events> CASE_EVENTS_OF_INTEREST = EnumSet.of(Case.Events.CURRENT_CASE,
             Case.Events.DATA_SOURCE_ADDED, Case.Events.DATA_SOURCE_DELETED);
     private static final long serialVersionUID = 1L;
@@ -116,6 +119,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
         add(imageFilterPanel, CENTER);
         imageFilterPanel.addPropertyChangeListener(listener);
         updateComboBoxes();
+        groupSortingComboBox.setSelectedItem(BY_GROUP_SIZE);
         pack();
         repaint();
     }
@@ -129,6 +133,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
         for (FileSearch.GroupingAttributeType type : FileSearch.GroupingAttributeType.getOptionsForGrouping()) {
             addTypeToGroupByComboBox(type);
         }
+        groupByCombobox.setSelectedItem(PARENT_PATH);
         orderByCombobox.removeAllItems();
         // Set up the file order list
         for (FileSorter.SortingMethod method : FileSorter.SortingMethod.getOptionsForOrdering()) {
@@ -136,7 +141,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
                 orderByCombobox.addItem(method);
             }
         }
-        groupSortingComboBox.setSelectedIndex(0);
+        orderByCombobox.setSelectedItem(BY_FILE_NAME);
     }
 
     /**
@@ -512,7 +517,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
         tc.toFront();
         tc.requestActive();
     }//GEN-LAST:event_searchButtonActionPerformed
-
+    
     @Override
     public void dispose() {
         setVisible(false);
@@ -531,7 +536,8 @@ final class DiscoveryDialog extends javax.swing.JDialog {
      * The adjust the controls to reflect whether the settings are valid based
      * on the error.
      *
-     * @param error The error message to display, empty string if there is no error.
+     * @param error The error message to display, empty string if there is no
+     *              error.
      */
     private void setValid(String error) {
         if (StringUtils.isBlank(error)) {
@@ -560,7 +566,7 @@ final class DiscoveryDialog extends javax.swing.JDialog {
      * filters available.
      */
     private class CasePropertyChangeListener implements PropertyChangeListener {
-
+        
         @Override
         @SuppressWarnings("fallthrough")
         public void propertyChange(PropertyChangeEvent evt) {
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java
index 216a3c12b3..fcd26fed08 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java
@@ -34,13 +34,15 @@ final class DocumentFilterPanel extends AbstractFiltersPanel {
     DocumentFilterPanel() {
         super();
         initComponents();
-        addFilter(new SizeFilterPanel(FileSearchData.FileType.DOCUMENTS), false, null, 0);
+        SizeFilterPanel sizeFilterPanel = new SizeFilterPanel(FILE_TYPE);
+        int[] sizeIndicesSelected = {3, 4, 5};
+        addFilter(sizeFilterPanel, true, sizeIndicesSelected, 0);
         addFilter(new DataSourceFilterPanel(), false, null, 0);
         int[] pastOccurrencesIndices;
         if (!CentralRepository.isEnabled()) {
             pastOccurrencesIndices = new int[]{0};
         } else {
-            pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
+            pastOccurrencesIndices = new int[]{2, 3, 4};
         }
         addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
         addFilter(new HashSetFilterPanel(), false, null, 1);
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.java
index 8eec6dd60f..dfe8a9de31 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/ImageFilterPanel.java
@@ -35,14 +35,14 @@ final class ImageFilterPanel extends AbstractFiltersPanel {
         super();
         initComponents();
         SizeFilterPanel sizeFilterPanel = new SizeFilterPanel(FILE_TYPE);
-        int[] sizeIndicesSelected = {1, 2, 3, 4, 5};
+        int[] sizeIndicesSelected = {3, 4, 5};
         addFilter(sizeFilterPanel, true, sizeIndicesSelected, 0);
         addFilter(new DataSourceFilterPanel(), false, null, 0);
         int[] pastOccurrencesIndices;
         if (!CentralRepository.isEnabled()) {
             pastOccurrencesIndices = new int[]{0};
         } else {
-            pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
+            pastOccurrencesIndices = new int[]{2, 3, 4};
         }
         addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
         addFilter(new UserCreatedFilterPanel(), false, null, 1);
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java
index 4f2684339b..97cd8e818d 100644
--- a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java
@@ -34,13 +34,15 @@ final class VideoFilterPanel extends AbstractFiltersPanel {
     VideoFilterPanel() {
         super();
         initComponents();
-        addFilter(new SizeFilterPanel(FileSearchData.FileType.VIDEO), false, null, 0);
+        SizeFilterPanel sizeFilterPanel = new SizeFilterPanel(FILE_TYPE);
+        int[] sizeIndicesSelected = {3, 4, 5};
+        addFilter(sizeFilterPanel, true, sizeIndicesSelected, 0);
         addFilter(new DataSourceFilterPanel(), false, null, 0);
         int[] pastOccurrencesIndices;
         if (!CentralRepository.isEnabled()) {
             pastOccurrencesIndices = new int[]{0};
         } else {
-            pastOccurrencesIndices = new int[]{1, 2, 3, 4, 5, 6, 7};
+            pastOccurrencesIndices = new int[]{2, 3, 4};
         }
         addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0);
         addFilter(new UserCreatedFilterPanel(), false, null, 1);