diff --git a/src/calendareventquery.cpp b/src/calendareventquery.cpp
index 0ba7806..9077fdf 100644
--- a/src/calendareventquery.cpp
+++ b/src/calendareventquery.cpp
@@ -46,13 +46,11 @@ CalendarEventQuery::CalendarEventQuery()
 
     connect(CalendarManager::instance(), SIGNAL(eventUidChanged(QString,QString)),
             this, SLOT(eventUidChanged(QString,QString)));
-
-    CalendarManager::instance()->registerEventQuery(this);
 }
 
 CalendarEventQuery::~CalendarEventQuery()
 {
-    CalendarManager::instance()->unRegisterEventQuery(this);
+    CalendarManager::instance()->cancelEventQueryRefresh(this);
 }
 
 // The uid of the matched event
diff --git a/src/calendarmanager.cpp b/src/calendarmanager.cpp
index 17ce10c..2e9e8ad 100644
--- a/src/calendarmanager.cpp
+++ b/src/calendarmanager.cpp
@@ -256,16 +256,6 @@ void CalendarManager::scheduleAgendaRefresh(CalendarAgendaModel *model)
         mTimer->start();
 }
 
-void CalendarManager::registerEventQuery(CalendarEventQuery *query)
-{
-    mQueryList.append(query);
-}
-
-void CalendarManager::unRegisterEventQuery(CalendarEventQuery *query)
-{
-    mQueryList.removeOne(query);
-}
-
 void CalendarManager::scheduleEventQueryRefresh(CalendarEventQuery *query)
 {
     if (mQueryRefreshList.contains(query))
@@ -277,6 +267,11 @@ void CalendarManager::scheduleEventQueryRefresh(CalendarEventQuery *query)
         mTimer->start();
 }
 
+void CalendarManager::cancelEventQueryRefresh(CalendarEventQuery *query)
+{
+    mQueryRefreshList.removeOne(query);
+}
+
 static QDate agenda_endDate(const CalendarAgendaModel *model)
 {
     QDate endDate = model->endDate();
diff --git a/src/calendarmanager.h b/src/calendarmanager.h
index 313a505..46f08fa 100644
--- a/src/calendarmanager.h
+++ b/src/calendarmanager.h
@@ -96,9 +96,8 @@ class CalendarManager : public QObject
     void scheduleAgendaRefresh(CalendarAgendaModel *model);
 
     // EventQuery
-    void registerEventQuery(CalendarEventQuery *query);
-    void unRegisterEventQuery(CalendarEventQuery *query);
     void scheduleEventQueryRefresh(CalendarEventQuery *query);
+    void cancelEventQueryRefresh(CalendarEventQuery *query);
 
     // Invitation event search
     void scheduleInvitationQuery(CalendarInvitationQuery *query, const QString &invitationFile);
@@ -158,7 +157,6 @@ private slots:
     QHash<QDate, QStringList> mEventOccurrenceForDates;
     QList<CalendarAgendaModel *> mAgendaRefreshList;
     QList<CalendarEventQuery *> mQueryRefreshList;
-    QList<CalendarEventQuery *> mQueryList; // List of all CalendarEventQuery instances
     QHash<CalendarInvitationQuery *, QString> mInvitationQueryHash; // value is the invitationFile.
     QStringList mExcludedNotebooks;
     QHash<QString, CalendarData::Notebook> mNotebooks;