diff --git a/gramps/plugins/drawreport/calendarreport.py b/gramps/plugins/drawreport/calendarreport.py
index d5888c4cb..e51395914 100644
--- a/gramps/plugins/drawreport/calendarreport.py
+++ b/gramps/plugins/drawreport/calendarreport.py
@@ -565,8 +565,8 @@ class CalendarOptions(MenuReportOptions):
         person = self.__db.get_person_from_gramps_id(gid)
         nfv = self._nf.get_value()
         filter_list = utils.get_person_filters(person,
-                                                     include_single=False,
-                                                     name_format=nfv)
+                                               include_single=False,
+                                               name_format=nfv)
         self.__filter.set_filters(filter_list)
 
     def __filter_changed(self):
@@ -575,12 +575,11 @@ class CalendarOptions(MenuReportOptions):
         disable the person option
         """
         filter_value = self.__filter.get_value()
-        if filter_value in [1, 2, 3, 4]:
-            # Filters 1, 2, 3 and 4 rely on the center person
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def make_my_style(self, default_style, name, description,
                       size=9, font=FONT_SERIF, justified ="left",
diff --git a/gramps/plugins/drawreport/statisticschart.py b/gramps/plugins/drawreport/statisticschart.py
index 2be3cff79..7928ba142 100644
--- a/gramps/plugins/drawreport/statisticschart.py
+++ b/gramps/plugins/drawreport/statisticschart.py
@@ -1102,7 +1102,7 @@ class StatisticsChartOptions(MenuReportOptions):
         if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
         else:
-            # The other filters need a center person (assume custom ones do)
+            # The other filters need a center person (assume custom ones too)
             self.__pid.set_available(True)
 
     def make_default_style(self, default_style):
diff --git a/gramps/plugins/drawreport/timeline.py b/gramps/plugins/drawreport/timeline.py
index dd5c84d93..4d999fbcc 100644
--- a/gramps/plugins/drawreport/timeline.py
+++ b/gramps/plugins/drawreport/timeline.py
@@ -452,8 +452,8 @@ class TimeLineOptions(MenuReportOptions):
         person = self.__db.get_person_from_gramps_id(gid)
         nfv = self._nf.get_value()
         filter_list = utils.get_person_filters(person,
-                                                     include_single=False,
-                                                     name_format=nfv)
+                                               include_single=False,
+                                               name_format=nfv)
         self.__filter.set_filters(filter_list)
 
     def __filter_changed(self):
@@ -462,12 +462,11 @@ class TimeLineOptions(MenuReportOptions):
         disable the person option
         """
         filter_value = self.__filter.get_value()
-        if filter_value in [1, 2, 3, 4]:
-            # Filters 1, 2, 3 and 4 rely on the center person
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def make_default_style(self, default_style):
         """Make the default output style for the Timeline report."""
diff --git a/gramps/plugins/graph/gvrelgraph.py b/gramps/plugins/graph/gvrelgraph.py
index 0767e3b5f..18662572f 100644
--- a/gramps/plugins/graph/gvrelgraph.py
+++ b/gramps/plugins/graph/gvrelgraph.py
@@ -829,8 +829,8 @@ class RelGraphOptions(MenuReportOptions):
         person = self.__db.get_person_from_gramps_id(gid)
         nfv = self._nf.get_value()
         filter_list = utils.get_person_filters(person,
-                                                     include_single=False,
-                                                     name_format=nfv)
+                                               include_single=False,
+                                               name_format=nfv)
         self.__filter.set_filters(filter_list)
 
     def __filter_changed(self):
@@ -838,15 +838,14 @@ class RelGraphOptions(MenuReportOptions):
         Handle filter change. If the filter is not specific to a person,
         disable the person option
         """
+        if self.__show_relships and self.__show_relships.get_value():
+            self.__pid.set_available(True)
         filter_value = self.__filter.get_value()
-        if filter_value in [1, 2, 3, 4]:
-            # Filters 1, 2, 3 and 4 rely on the center person
-            self.__pid.set_available(True)
-        elif self.__show_relships and self.__show_relships.get_value():
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def __image_changed(self):
         """
diff --git a/gramps/plugins/textreport/birthdayreport.py b/gramps/plugins/textreport/birthdayreport.py
index 090467500..753c05c1f 100644
--- a/gramps/plugins/textreport/birthdayreport.py
+++ b/gramps/plugins/textreport/birthdayreport.py
@@ -526,7 +526,7 @@ class BirthdayOptions(MenuReportOptions):
         if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
         else:
-            # The other filters need a center person (assume custom ones do)
+            # The other filters need a center person (assume custom ones too)
             self.__pid.set_available(True)
 
     def make_my_style(self, default_style, name, description,
diff --git a/gramps/plugins/textreport/familygroup.py b/gramps/plugins/textreport/familygroup.py
index d4edde62f..49ffd85bd 100644
--- a/gramps/plugins/textreport/familygroup.py
+++ b/gramps/plugins/textreport/familygroup.py
@@ -821,7 +821,7 @@ class FamilyGroupOptions(MenuReportOptions):
         if filter_value == 1: # "Entire Database" (as "include_single=True")
             self.__fid.set_available(False)
         else:
-            # The other filters need a center family (assume custom ones do)
+            # The other filters need a center family (assume custom ones too)
             self.__fid.set_available(True)
 
         # only allow recursion if the center family is the only family
diff --git a/gramps/plugins/textreport/indivcomplete.py b/gramps/plugins/textreport/indivcomplete.py
index 2d9a9f8fc..9883c2d0a 100644
--- a/gramps/plugins/textreport/indivcomplete.py
+++ b/gramps/plugins/textreport/indivcomplete.py
@@ -1130,8 +1130,8 @@ class IndivCompleteOptions(MenuReportOptions):
         person = self.__db.get_person_from_gramps_id(gid)
         nfv = self._nf.get_value()
         filter_list = utils.get_person_filters(person,
-                                                     include_single=True,
-                                                     name_format=nfv)
+                                               include_single=True,
+                                               name_format=nfv)
         self.__filter.set_filters(filter_list)
 
     def __filter_changed(self):
@@ -1140,12 +1140,11 @@ class IndivCompleteOptions(MenuReportOptions):
         disable the person option
         """
         filter_value = self.__filter.get_value()
-        if filter_value in [0, 2, 3, 4, 5]:
-            # Filters 0, 2, 3, 4 and 5 rely on the center person
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 1: # "Entire Database" (as "include_single=True")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def __sources_changed(self):
         """
diff --git a/gramps/plugins/textreport/recordsreport.py b/gramps/plugins/textreport/recordsreport.py
index 8c1cf0fa8..4222666a0 100644
--- a/gramps/plugins/textreport/recordsreport.py
+++ b/gramps/plugins/textreport/recordsreport.py
@@ -293,7 +293,7 @@ class RecordsReportOptions(MenuReportOptions):
         if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
         else:
-            # The other filters need a center person (assume custom ones do)
+            # The other filters need a center person (assume custom ones too)
             self.__pid.set_available(True)
 
     def make_default_style(self, default_style):
diff --git a/gramps/plugins/tool/sortevents.py b/gramps/plugins/tool/sortevents.py
index 4e74c551b..f7d0ffe65 100644
--- a/gramps/plugins/tool/sortevents.py
+++ b/gramps/plugins/tool/sortevents.py
@@ -197,12 +197,11 @@ class SortEventOptions(MenuToolOptions):
         disable the person option
         """
         filter_value = self.__filter.get_value()
-        if filter_value in [1, 2, 3, 4]:
-            # Filters 1, 2, 3 and 4 rely on the center person
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def __update_filters(self):
         """
@@ -210,5 +209,5 @@ class SortEventOptions(MenuToolOptions):
         """
         gid = self.__pid.get_value()
         person = self.__db.get_person_from_gramps_id(gid)
-        filter_list = utils.get_person_filters(person, False)
+        filter_list = utils.get_person_filters(person, include_single=False)
         self.__filter.set_filters(filter_list)
diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py
index a6a62ad5e..b178a80c5 100644
--- a/gramps/plugins/webreport/narrativeweb.py
+++ b/gramps/plugins/webreport/narrativeweb.py
@@ -10073,7 +10073,7 @@ class NavWebOptions(MenuReportOptions):
         """
         gid = self.__pid.get_value()
         person = self.__db.get_person_from_gramps_id(gid)
-        filter_list = utils.get_person_filters(person, False)
+        filter_list = utils.get_person_filters(person, include_single=False)
         self.__filter.set_filters(filter_list)
 
     def __filter_changed(self):
@@ -10082,12 +10082,11 @@ class NavWebOptions(MenuReportOptions):
         disable the person option
         """
         filter_value = self.__filter.get_value()
-        if filter_value in [1, 2, 3, 4]:
-            # Filters 1, 2, 3 and 4 rely on the center person
-            self.__pid.set_available(True)
-        else:
-            # The rest don't
+        if filter_value == 0: # "Entire Database" (as "include_single=False")
             self.__pid.set_available(False)
+        else:
+            # The other filters need a center person (assume custom ones too)
+            self.__pid.set_available(True)
 
     def __stylesheet_changed(self):
         """