diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py
index 98a0edd4e..3ed274e6d 100644
--- a/gramps2/src/PeopleModel.py
+++ b/gramps2/src/PeopleModel.py
@@ -161,6 +161,14 @@ class PeopleModel(gtk.GenericTreeModel):
                     self.path2iter[tpl] = person_id
                     val += 1
                 sval += 1
+        self.db.set_people_view_maps(self.get_maps())
+
+    def get_maps(self):
+        return (self.top_iter2path,
+                self.top_path2iter,
+                self.iter2path,
+                self.path2iter,
+                self.sname_sub)
 
     def add_person(self,person):
         pid = person.get_id()
diff --git a/gramps2/src/PeopleView.py b/gramps2/src/PeopleView.py
index 663cdf108..c5631d945 100644
--- a/gramps2/src/PeopleView.py
+++ b/gramps2/src/PeopleView.py
@@ -86,11 +86,7 @@ class PeopleView:
                                  self.on_plist_button_press)
 
     def get_maps(self):
-        return (self.person_model.top_iter2path,
-                self.person_model.top_path2iter,
-                self.person_model.iter2path,
-                self.person_model.path2iter,
-                self.person_model.sname_sub)
+        return self.person_model.get_maps()
 
     def build_columns(self):
         for column in self.columns:
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index bb791d05f..df568944a 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -1470,7 +1470,10 @@ class Gramps:
                 for (importData,filter,mime_type) in Plugins._imports:
                     if filetype == mime_type or the_file == mime_type:
                         OkDialog( _("Opening non-native format"), 
-                                _("New gramps database has to be set up when opening non-native formats. The following dialog will let you select the new database."),
+                                _("New gramps database has to be set up "
+                                  "when opening non-native formats. The "
+                                  "following dialog will let you select "
+                                  "the new database."),
                                 self.topWindow)
                         DbPrompter.DbPrompter(self,1,self.topWindow,filename)
                         importData(self.db,filename)
diff --git a/gramps2/src/plugins/WriteGedcom.py b/gramps2/src/plugins/WriteGedcom.py
index 36b0e5252..c536a10a7 100644
--- a/gramps2/src/plugins/WriteGedcom.py
+++ b/gramps2/src/plugins/WriteGedcom.py
@@ -1125,15 +1125,15 @@ class GedcomWriter:
         suffix = self.cnvtxt(name.get_suffix())
         title = self.cnvtxt(name.get_title())
         if suffix == "":
-            if not surPref:
-                self.writeln("1 NAME %s /%s/" % (firstName,surName))
+            if surPref == "":
+                self.writeln("1 NAME %s/%s/" % (firstName,surName))
             else:
-                self.writeln("1 NAME %s /%s %s/" % (firstName,surPref,surName))
+                self.writeln("1 NAME %s/%s %s/" % (firstName,surPref,surName))
         else:
-            if not surPref:
-                self.writeln("1 NAME %s /%s %s/, %s" % (firstName,surPref,surName,suffix))
+            if surPref == "":
+                self.writeln("1 NAME %s/%s/%s" % (firstName,surName,suffix))
             else:
-                self.writeln("1 NAME %s /%s/, %s" % (firstName,surName,suffix))
+                self.writeln("1 NAME %s/%s %s/%s" % (firstName,surPref,surName,suffix))
 
         if name.get_first_name():
             self.writeln("2 GIVN %s" % firstName)