diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 09d4967e7..23caacb84 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-14  Don Allingham  <don@gramps-project.org>
+	* src/DateHandler/__init__.py: import DateParser and DateDisplay
+	* src/DataViews/_PersonView.py: default gender filter to "any"
+	* configure.in: bump up to 2.1.2
+
 2006-05-14  Alex Roitman  <shura@gramps-project.org>
 	* src/DateHandler/__init__.py: Proper import sequence.
 	* src/DateHandler/_DateHandler.py: Split into parts.
diff --git a/gramps2/configure.in b/gramps2/configure.in
index f04fcf0a9..24d9c4c79 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=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py
index 667fa7779..433bcdce4 100644
--- a/gramps2/src/DataViews/_PersonView.py
+++ b/gramps2/src/DataViews/_PersonView.py
@@ -237,6 +237,7 @@ class PersonView(PageView.PersonNavView):
         self.filter_gender = gtk.combo_box_new_text()
         for i in [ _('any'), _('male'), _('female'), _('unknown') ]:
             self.filter_gender.append_text(i)
+        self.filter_gender.set_active(0)
             
         self.filter_regex = gtk.CheckButton(_('Use regular expressions'))
         
diff --git a/gramps2/src/DateHandler/__init__.py b/gramps2/src/DateHandler/__init__.py
index 5de11561a..147888285 100644
--- a/gramps2/src/DateHandler/__init__.py
+++ b/gramps2/src/DateHandler/__init__.py
@@ -28,6 +28,9 @@ Class handling language-specific selection for date parser and displayer.
 from _DateHandler import _lang, _lang_short, \
     _lang_to_parser, _lang_to_display, register_datehandler
 
+from _DateDisplay import DateDisplay
+from _DateParser import DateParser
+
 # Import all the localized handlers
 import _Date_de
 import _Date_es
diff --git a/gramps2/src/DisplayModels.py b/gramps2/src/DisplayModels.py
index 7a2d30054..d2df87cde 100644
--- a/gramps2/src/DisplayModels.py
+++ b/gramps2/src/DisplayModels.py
@@ -93,6 +93,7 @@ class BaseModel(gtk.GenericTreeModel):
 
     def set_sort_column(self,col):
         self.sort_func = self.smap[col]
+        #print self.sort_func
 
     def sort_keys(self):
         cursor = self.gen_cursor()
@@ -607,6 +608,7 @@ class EventModel(BaseModel):
             self.column_cause,
             self.sort_change,
             self.column_handle,
+            self.column_tooltip,
             ]
         BaseModel.__init__(self, db, scol, order, tooltip_column=8,
                            search=search)
@@ -643,10 +645,11 @@ class EventModel(BaseModel):
         return unicode(data[0])
 
     def sort_change(self,data):
-        return time.localtime(data[11])
+        #print time.localtime(data[10])
+        return time.localtime(data[10])
 
     def column_change(self,data):
-        return unicode(time.strftime('%x %X',time.localtime(data[11])),
+        return unicode(time.strftime('%x %X',time.localtime(data[10])),
                             _codeset)
 
     def column_tooltip(self,data):
diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py
index c830d3b3e..b7af6c556 100644
--- a/gramps2/src/PageView.py
+++ b/gramps2/src/PageView.py
@@ -588,7 +588,8 @@ class ListView(BookMarkView):
         for i in xrange(len(self.columns)):
             self.columns[i].set_sort_indicator(i==colmap[data][1])
         self.columns[self.sort_col].set_sort_order(order)
-
+#        print self.sort_col, order, colmap
+        
     def build_columns(self):
         for column in self.columns:
             self.list.remove_column(column)