diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 6fcec01eb..c9a501ed3 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -7,6 +7,7 @@
 	indexes to the length of the tables to prevent a walk of the db 
 	entries.
 	* src/DisplayModels/_BaseModel.py: handle row-insert properly
+	(BaseModel.delete_row_by_handle): fix sort array after delete
 	* src/PageView.py: handle row adding properly
 
 2007-01-22  Alex Roitman  <shura@gramps-project.org>
diff --git a/gramps2/configure.in b/gramps2/configure.in
index ee8a65325..506a508f9 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -11,8 +11,8 @@ AM_INIT_AUTOMAKE(1.6.3)
 AC_CONFIG_MACRO_DIR([m4])
 GNOME_DOC_INIT
 
-RELEASE=0.SVN$(svnversion -n .)
-dnl RELEASE=1
+dnl RELEASE=0.SVN$(svnversion -n .)
+RELEASE=0rc1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
diff --git a/gramps2/po/POTFILES.in b/gramps2/po/POTFILES.in
index 2c7571e2d..25cfc2c31 100644
--- a/gramps2/po/POTFILES.in
+++ b/gramps2/po/POTFILES.in
@@ -67,7 +67,6 @@ src/DataViews/_EventView.py
 src/DataViews/_FamilyList.py
 src/DataViews/_RelationView.py
 src/DataViews/__init__.py
-src/DataViews/_MapView.py
 src/DataViews/_MediaView.py
 src/DataViews/_PedigreeView.py
 src/DataViews/_PersonView.py
diff --git a/gramps2/po/gramps.pot b/gramps2/po/gramps.pot
index d136504ca..4b909549c 100644
--- a/gramps2/po/gramps.pot
+++ b/gramps2/po/gramps.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-23 17:50-0700\n"
+"POT-Creation-Date: 2007-01-23 18:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -201,13 +201,13 @@ msgstr ""
 msgid "Column Editor"
 msgstr ""
 
-#: ../src/const.py:148
+#: ../src/const.py:149
 msgid ""
 "GRAMPS (Genealogical Research and Analysis Management Programming System) is "
 "a personal genealogy program."
 msgstr ""
 
-#: ../src/const.py:166
+#: ../src/const.py:167
 msgid "TRANSLATORS: Translate this to your name in your native language"
 msgstr ""
 
@@ -2099,42 +2099,6 @@ msgstr ""
 msgid "Children"
 msgstr ""
 
-#: ../src/DataViews/_MapView.py:622
-msgid "Maps"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:631
-msgid "Zoom _In"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:631
-msgid "Zoom in by a factor of 2"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:634
-msgid "Zoom _Out"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:634
-msgid "Zoom out by a factor of 2"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:637
-msgid "_Normal Size"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:637
-msgid "Return to normal size"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:640
-msgid "Best _Fit"
-msgstr ""
-
-#: ../src/DataViews/_MapView.py:641
-msgid "Produce the best fit of the map in the window"
-msgstr ""
-
 #: ../src/DataViews/_MediaView.py:83
 msgid "Add a new media object"
 msgstr ""
diff --git a/gramps2/src/DisplayModels/_BaseModel.py b/gramps2/src/DisplayModels/_BaseModel.py
index 86588143b..50dd228b2 100644
--- a/gramps2/src/DisplayModels/_BaseModel.py
+++ b/gramps2/src/DisplayModels/_BaseModel.py
@@ -147,7 +147,6 @@ class BaseModel(gtk.GenericTreeModel):
             self.indexlist = {}
         
     def add_row_by_handle(self,handle):
-
 	if self.search and self.search.match(handle):
 
 	    data = self.map(handle)
@@ -170,6 +169,14 @@ class BaseModel(gtk.GenericTreeModel):
     def delete_row_by_handle(self,handle):
         index = self.indexlist[handle]
 
+        # remove from sort array
+        i = 0
+        for (key, node) in self.sarray:
+            if handle == node:
+                del self.sarray[i]
+                break
+            i += 1
+
 	del self.datalist[index]
 	del self.indexlist[handle]