diff --git a/src/BreCalClient/AboutDialog.xaml b/src/BreCalClient/AboutDialog.xaml
index 544c3cc..60c0183 100644
--- a/src/BreCalClient/AboutDialog.xaml
+++ b/src/BreCalClient/AboutDialog.xaml
@@ -25,7 +25,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="28" />
                           
         </Grid.RowDefinitions>
diff --git a/src/BreCalClient/SearchFilterControl.xaml.cs b/src/BreCalClient/SearchFilterControl.xaml.cs
index 4310ba0..2814c8e 100644
--- a/src/BreCalClient/SearchFilterControl.xaml.cs
+++ b/src/BreCalClient/SearchFilterControl.xaml.cs
@@ -72,7 +72,7 @@ namespace BreCalClient
             this.comboBoxAgencies.UnSelectAll();
             this.comboBoxBerths.UnSelectAll();
             this.comboBoxCategories.UnSelectAll();
-            this.datePickerETAFrom.SelectedDate = null;
+            this.datePickerETAFrom.SelectedDate = DateTime.Now.AddDays(-2);
             this.datePickerETATo.SelectedDate = null;
             this.textBoxSearch.Clear();
             this.upDownShiplengthFrom.Value = null;
@@ -107,7 +107,10 @@ namespace BreCalClient
             if (sfm.SearchString != null) this.textBoxSearch.Text = sfm.SearchString;
             this.upDownShiplengthFrom.Value = sfm.ShipLengthFrom;
             this.upDownShiplengthTo.Value = sfm.ShipLengthTo;
-            this.datePickerETAFrom.SelectedDate = sfm.EtaFrom;
+            if (sfm.EtaFrom != null)
+                this.datePickerETAFrom.SelectedDate = sfm.EtaFrom;
+            else
+                this.datePickerETAFrom.SelectedDate = DateTime.Now.AddDays(-2);
             this.datePickerETATo.SelectedDate = sfm.EtaTo;
             this.checkBoxOwn.IsChecked = sfm.MineOnly;