diff --git a/sleepyhead/SleepLib/calcs.cpp b/sleepyhead/SleepLib/calcs.cpp
index 4829047d..950bde3c 100644
--- a/sleepyhead/SleepLib/calcs.cpp
+++ b/sleepyhead/SleepLib/calcs.cpp
@@ -34,6 +34,10 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType
     int cnt;
 
     //qint64 rate;
+    bool fixdurations = (session->machine()->GetClass() != STR_MACH_ResMed);
+    if (!fixdurations) {
+        dur=0;
+    }
 
     QHash<ChannelID, QVector<EventList *> >::iterator evend = session->eventlist.end();
     if (it != evend) {
@@ -76,6 +80,12 @@ bool SearchEvent(Session * session, ChannelID code, qint64 time, EventStoreType
 
 bool SearchApnea(Session *session, qint64 time, double dur, qint64 dist)
 {
+    if (session->SearchEvent(CPAP_UserFlag1, time, dist))
+        return true;
+
+    if (session->SearchEvent(CPAP_UserFlag2, time, dist))
+        return true;
+
     if (SearchEvent(session, CPAP_Obstructive, time, dur, dist))
         return true;
 
@@ -85,14 +95,9 @@ bool SearchApnea(Session *session, qint64 time, double dur, qint64 dist)
     if (SearchEvent(session, CPAP_ClearAirway, time, dur, dist))
         return true;
 
-    if (SearchEvent(session, CPAP_Hypopnea, time, 0, dist))
+    if (SearchEvent(session, CPAP_Hypopnea, time, dur, dist))
         return true;
 
-    if (session->SearchEvent(CPAP_UserFlag1, time, dist))
-        return true;
-
-    if (session->SearchEvent(CPAP_UserFlag2, time, dist))
-        return true;
 
     return false;
 }
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index 5c057f41..07114751 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -750,6 +750,7 @@ void Daily::LoadDate(QDate date)
 
 void Daily::on_calendar_selectionChanged()
 {
+    graphView()->releaseKeyboard();
     QTime time;
     time_t unload_time, load_time, other_time;
     time.start();
diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html
index 8671df1b..a719c6eb 100644
--- a/sleepyhead/docs/release_notes.html
+++ b/sleepyhead/docs/release_notes.html
@@ -10,8 +10,10 @@
 <br/>
 <b>New features & bug fixes in v0.9.7</b><br/>
 <list>
+<li>New Feature: Added second set of User Flags detection and preferences.</li>
 <li>New Feature: Hit Escape key to go back through previous graph selection history</li>
-<li>New Feature: Hold Shift while selecting a graph area to allow you to take another attempt</li>
+<li>New Feature: Holding Alt shows a vertical line, and the current time position when hovering over LineCharts</li>
+<li>New Feature: Hold Alt while selecting a graph area to allow you to take another attempt</li>
 <li>Fixed changing languages clobbering graph settings</li>
 <li>Import now remembers last place you imported from</li>
 <li>Lock files are now used to help protect the same profiles being open multiple times</li>
diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp
index b92dc74b..b96e9ec6 100644
--- a/sleepyhead/preferencesdialog.cpp
+++ b/sleepyhead/preferencesdialog.cpp
@@ -295,6 +295,8 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
     ui->graphView->setModel(graphFilterModel);
 
     resetGraphModel();
+
+    grabKeyboard();
     //    tree->sortByColumn(0,Qt::AscendingOrder);
 }