diff --git a/R/mod_generic_filters.R b/R/mod_generic_filters.R
index 965f25c..2026e52 100644
--- a/R/mod_generic_filters.R
+++ b/R/mod_generic_filters.R
@@ -309,14 +309,19 @@ mod_generic_filters_server <-
       
       observe({
         req(domain())
-        req(repName() %in% c("eDISH_plot"))
+        if (repName() == "eDISH_plot") {
+          text <- "PARAMCD %in% c('ALT', 'AST', 'BILI')"
+        } else {
+          text <- "USUBJID != ''"
+        }
         updateTextInput(
           session,
           "a_subset",
           "Analysis Subset",
-          "PARAMCD %in% c('ALT', 'AST', 'BILI')"
+          text
         )
-      })
+      }) %>%
+        bindEvent(repName())
 
       # observer to control showing/hiding inputs based on report selection
       observe({
diff --git a/R/mod_goutput.R b/R/mod_goutput.R
index 2214b16..681ea78 100644
--- a/R/mod_goutput.R
+++ b/R/mod_goutput.R
@@ -280,6 +280,7 @@ mod_goutput_server <- function(id, sourcedata, repName, filters, process_btn) {
 
     observe({
       req(filters()$ae_pre)
+      req(tolower(repName()) %in% c("edish_plot"))
 
       series_opts <- plot_aes_opts(
         filters()$ae_pre,