diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 7ab3a30751..872e7c7a20 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -57,7 +57,7 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr
 
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     private static final String REPORTING_CONFIGURATION_NAME = "ReportAction";
-    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = true;
+    private static final boolean DISPLAY_CASE_SPECIFIC_DATA = false; //ELTODO true;
     private static final boolean RUN_REPORTS = true;
     private final JButton toolbarButton = new JButton();
     private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index 36436bbe83..c39efacdb6 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -20,8 +20,6 @@ package org.sleuthkit.autopsy.report;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 import java.util.prefs.Preferences;
 import javax.swing.JButton;
@@ -35,7 +33,7 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
 
     private WizardDescriptor wiz;
     private ReportVisualPanel1 component;
-    private Map<String, ReportModuleConfig> moduleConfigs;
+    private final Map<String, ReportModuleConfig> moduleConfigs;
     private final JButton nextButton;
     private final JButton finishButton;
 
@@ -114,12 +112,11 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
         TableReportModule module = getComponent().getTableModule();
         GeneralReportModule general = getComponent().getGeneralModule();
         PortableCaseReportModule portable = getComponent().getPortableCaseModule();
-        Map<String, ReportModuleConfig> moduleConfigs = getComponent().getUpdatedModuleConfigs();
         wiz.putProperty("tableModule", module); //NON-NLS
         wiz.putProperty("generalModule", general); //NON-NLS
         wiz.putProperty("fileModule", getComponent().getFileModule()); //NON-NLS
         wiz.putProperty("portableCaseModule", portable); //NON-NLS
-        wiz.putProperty("moduleConfigs", moduleConfigs); //NON-NLS
+        wiz.putProperty("moduleConfigs", getComponent().getUpdatedModuleConfigs()); //NON-NLS
 
         // Store preferences that WizardIterator will use to determine what 
         // panels need to be shown
@@ -128,20 +125,4 @@ class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescr
         prefs.putBoolean("generalModule", general != null); //NON-NLS
         prefs.putBoolean("portableCaseModule", portable != null); //NON-NLS
     }
-
-    /**
-     * Are any of the given booleans true?
-     *
-     * @param bools
-     *
-     * @return
-     */
-    private boolean any(Collection<Boolean> bools) {
-        for (Boolean b : bools) {
-            if (b) {
-                return true;
-            }
-        }
-        return false;
-    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index f84dcb69e3..34f25c67db 100644
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -82,7 +82,7 @@ class TableReportGenerator {
         this.settings = settings;
     }
     
-    private void getAllExistingTags(boolean addNotableToTagNames) throws NoCurrentCaseException, TskCoreException {
+    private void getAllExistingTags() throws NoCurrentCaseException, TskCoreException {
         List<String> tagNames = new ArrayList<>();
 
         // get all possible tag names
@@ -90,9 +90,7 @@ class TableReportGenerator {
 
         String notableString = "";
         for (TagName tagName : tagNamesInUse) {
-            if (addNotableToTagNames) {
-                notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
-            }
+            notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
             tagNames.add(tagName.getDisplayName() + notableString);
         }
         tagNamesFilter = new HashSet<>(tagNames);
@@ -130,7 +128,7 @@ class TableReportGenerator {
                 // If report type is "all tagged results", then read all possible tab names from database.
                 // Otherwise do not load tag names, i.e. run "all results" report
                 if (settings.getReportType() == TableReportSettings.TableReportType.ALL_TAGGED_RESULTS) {
-                    getAllExistingTags(true); // ELTODO verify whether we should add (Notable) to tag names like we do in UI
+                    getAllExistingTags();
                 }
                 
                 // get all possible artifact types