diff --git a/src/Utils.py b/src/Utils.py
index 991321763..76997cbe6 100644
--- a/src/Utils.py
+++ b/src/Utils.py
@@ -465,6 +465,7 @@ def build_string_optmenu(mapping, start_val):
         else:
             menuitem = gtk.MenuItem(key)
         menuitem.set_data("d", mapping[key])
+        menuitem.set_data("l", key)
         menuitem.show()
         myMenu.append(menuitem)
         if key == start_val:
diff --git a/src/plugins/AncestorChart.py b/src/plugins/AncestorChart.py
index 74bd3c5c7..1e186300f 100644
--- a/src/plugins/AncestorChart.py
+++ b/src/plugins/AncestorChart.py
@@ -231,8 +231,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class AncestorChartDialog(Report.DrawReportDialog):
+
+    report_options = {}
+    
     def __init__(self,database,person):
-        Report.DrawReportDialog.__init__(self,database,person)
+        Report.DrawReportDialog.__init__(self,database,person,self.report_options)
 
     def get_title(self):
         """The window title for this dialog"""
diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py
index 7e56c1c13..7f7bdfe44 100644
--- a/src/plugins/AncestorReport.py
+++ b/src/plugins/AncestorReport.py
@@ -222,8 +222,11 @@ class AncestorReport(Report.Report):
 #
 #------------------------------------------------------------------------
 class AncestorReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/Ancestors.py b/src/plugins/Ancestors.py
index ec08c791d..0f4fd2947 100644
--- a/src/plugins/Ancestors.py
+++ b/src/plugins/Ancestors.py
@@ -329,7 +329,7 @@ class ComprehensiveAncestorsReport (Report.Report):
                             (partner != from_family_father and
                              partner != from_family_mother)):
                             for photo in partner.getPhotoList ()[:1]:
-                                if photo.getMimeType()[0:5] == "image":
+                                if photo.ref.getMimeType()[0:5] == "image":
                                     spouse.append ((self.doc.add_photo,
                                                     [photo.ref.getPath (),
                                                      'right', 2, 2]))
@@ -360,7 +360,7 @@ class ComprehensiveAncestorsReport (Report.Report):
                 else:
                     ret.append ((self.doc.start_cell, ["AR-Photo"]))
                     for photo in photos[:1]:
-                        if photo.getMimeType()[0:5] == "image":
+                        if photo.ref.getMimeType()[0:5] == "image":
                             ret.append ((self.doc.add_photo,
                                          [photo.ref.getPath (), 'left', 2, 2]))
                         ret.append ((self.doc.end_cell, []))
@@ -813,8 +813,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class ComprehensiveAncestorsReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py
index 7355cad29..5bdaf892c 100644
--- a/src/plugins/DetAncestralReport.py
+++ b/src/plugins/DetAncestralReport.py
@@ -726,8 +726,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class DetAncestorReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py
index 5bf7225bb..4b764e620 100644
--- a/src/plugins/DetDescendantReport.py
+++ b/src/plugins/DetDescendantReport.py
@@ -734,8 +734,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class DetDescendantReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py
index f852a59c2..5675b1e18 100644
--- a/src/plugins/FtmStyleAncestors.py
+++ b/src/plugins/FtmStyleAncestors.py
@@ -786,6 +786,7 @@ class FtmAncestorReport(Report.Report):
                             else:
                                 self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s"
                                                       "%(birth_endnotes)s. ") % {
+                                    'female_name' : _('She'), 'endnotes' : '',
                                     'birth_endnotes' : self.endnotes(birth),
                                     'birth_date' : bdate, 'birth_place' : bplace,
                                     })
@@ -990,8 +991,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class FtmAncestorReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py
index c84796f20..50ee43c4c 100644
--- a/src/plugins/FtmStyleDescendants.py
+++ b/src/plugins/FtmStyleDescendants.py
@@ -1399,8 +1399,11 @@ def _make_default_style(default_style):
 #
 #------------------------------------------------------------------------
 class FtmDescendantReportDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     #------------------------------------------------------------------------
     #
diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py
index 67fd889ab..6a9ee2f48 100644
--- a/src/plugins/GraphViz.py
+++ b/src/plugins/GraphViz.py
@@ -71,8 +71,11 @@ _pagecount_map = {
 #------------------------------------------------------------------------
 class GraphVizDialog(Report.ReportDialog):
 
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.ReportDialog.__init__(self,database,person)
+
+        Report.ReportDialog.__init__(self,database,person,self.report_options)
 
     def get_title(self):
         """The window title for this dialog"""
diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py
index da0228cb5..1314397a3 100644
--- a/src/plugins/IndivComplete.py
+++ b/src/plugins/IndivComplete.py
@@ -453,8 +453,11 @@ class IndivComplete(Report.Report):
 #
 #------------------------------------------------------------------------
 class IndivCompleteDialog(Report.TextReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person,self.report_options)
 
     def add_user_options(self):
         self.use_srcs = gtk.CheckButton(_('Include Source Information'))
diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py
index 7025f51b2..342524c93 100644
--- a/src/plugins/IndivSummary.py
+++ b/src/plugins/IndivSummary.py
@@ -330,8 +330,10 @@ class IndivSummary(Report.Report):
 #------------------------------------------------------------------------
 class IndivSummaryDialog(Report.TextReportDialog):
 
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.TextReportDialog.__init__(self,database,person)
+        Report.TextReportDialog.__init__(self,database,person, self.report_options)
 
     def get_title(self):
         """The window title for this dialog"""
diff --git a/src/plugins/RelGraph.py b/src/plugins/RelGraph.py
index b6f7232d8..6fcc5d112 100644
--- a/src/plugins/RelGraph.py
+++ b/src/plugins/RelGraph.py
@@ -98,8 +98,10 @@ class RelGraphDialog(Report.ReportDialog):
     TBMargin        = 0
     LRMargin        = 0
 
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.ReportDialog.__init__(self,database,person)
+        Report.ReportDialog.__init__(self,database,person,self.report_options)
 
     def get_title(self):
         """The window title for this dialog"""
diff --git a/src/plugins/TimeLine.py b/src/plugins/TimeLine.py
index ceba12ab9..64936a042 100644
--- a/src/plugins/TimeLine.py
+++ b/src/plugins/TimeLine.py
@@ -388,8 +388,10 @@ def _get_sort_functions():
 #------------------------------------------------------------------------
 class TimeLineDialog(Report.DrawReportDialog):
 
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.DrawReportDialog.__init__(self,database,person)
+        Report.DrawReportDialog.__init__(self,database,person,self.report_options)
 
     def get_title(self):
         """The window title for this dialog"""
diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py
index 02355c338..f7807bd89 100644
--- a/src/plugins/WebPage.py
+++ b/src/plugins/WebPage.py
@@ -889,8 +889,11 @@ class WebReport(Report.Report):
 #
 #------------------------------------------------------------------------
 class WebReportDialog(Report.ReportDialog):
+
+    report_options = {}
+
     def __init__(self,database,person):
-        Report.ReportDialog.__init__(self,database,person)
+        Report.ReportDialog.__init__(self,database,person, self.report_options)
 
     def add_user_options(self):
         lnk_msg = _("Include a link to the index page")