diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp
index 676aad2d7..d90627325 100644
--- a/src/libtomahawk/Pipeline.cpp
+++ b/src/libtomahawk/Pipeline.cpp
@@ -306,7 +306,7 @@ Pipeline::reportResults( QID qid, const QList< result_ptr >& results )
     if ( !cleanResults.isEmpty() )
     {
         q->addResults( cleanResults );
-        
+
         if ( m_queries_temporary.contains( q ) )
         {
             foreach ( const result_ptr& r, cleanResults )
@@ -564,7 +564,7 @@ Pipeline::onTemporaryQueryTimer()
     for ( int i = m_queries_temporary.count() - 1; i >= 0; i-- )
     {
         query_ptr q = m_queries_temporary.takeAt( i );
-        
+
         m_qids.remove( q->id() );
         foreach ( const Tomahawk::result_ptr& r, q->results() )
             m_rids.remove( r->id() );
diff --git a/src/libtomahawk/Playlist.h b/src/libtomahawk/Playlist.h
index bb4368f3c..194572d87 100644
--- a/src/libtomahawk/Playlist.h
+++ b/src/libtomahawk/Playlist.h
@@ -188,7 +188,6 @@ public:
     void setTitle( const QString& s );
     // </IGNORE>
 
-
     QList<plentry_ptr> entriesFromQueries( const QList<Tomahawk::query_ptr>& queries, bool clearFirst = false );
 
     void addUpdater( PlaylistUpdaterInterface* updater );
@@ -249,7 +248,6 @@ public slots:
     // entries should be <= entries(), with changed metadata.
     void updateEntries( const QString& newrev, const QString& oldrev, const QList< plentry_ptr >& entries );
 
-
     void reportCreated( const Tomahawk::playlist_ptr& self );
     void reportDeleted( const Tomahawk::playlist_ptr& self );
 
@@ -263,6 +261,7 @@ public slots:
     void resolve();
 
     void setWeakSelf( QWeakPointer< Playlist > self );
+
 protected:
     // called from loadAllPlaylists DB cmd:
     explicit Playlist( const source_ptr& src,
@@ -291,12 +290,12 @@ protected:
                                      bool is_newest_rev,
                                      const QMap< QString, Tomahawk::plentry_ptr >& addedmap );
 
-
 private slots:
     void onResultsChanged();
     void onResolvingFinished();
 
     void onDeleteResult( SourceTreePopupDialog* );
+
 private:
     Playlist();
     void init();
diff --git a/src/libtomahawk/Typedefs.h b/src/libtomahawk/Typedefs.h
index 9ed6d30c7..4543a2029 100644
--- a/src/libtomahawk/Typedefs.h
+++ b/src/libtomahawk/Typedefs.h
@@ -43,6 +43,7 @@ namespace Tomahawk
     class DynamicPlaylist;
     class Query;
     class Result;
+    class Track;
     class Source;
     class DynamicControl;
     class GeneratorInterface;
@@ -54,7 +55,11 @@ namespace Tomahawk
     typedef QSharedPointer<PlaylistInterface> playlistinterface_ptr;
     typedef QSharedPointer<DynamicPlaylist> dynplaylist_ptr;
     typedef QSharedPointer<Query> query_ptr;
+    typedef QWeakPointer<Query> query_wptr;
     typedef QSharedPointer<Result> result_ptr;
+    typedef QWeakPointer<Result> result_wptr;
+    typedef QSharedPointer<Track> track_ptr;
+    typedef QWeakPointer<Track> track_wptr;
     typedef QSharedPointer<Source> source_ptr;
     typedef QSharedPointer<Artist> artist_ptr;
     typedef QWeakPointer<Artist> artist_wptr;
diff --git a/src/libtomahawk/playlist/TrackView.cpp b/src/libtomahawk/playlist/TrackView.cpp
index f360c7f22..107d53349 100644
--- a/src/libtomahawk/playlist/TrackView.cpp
+++ b/src/libtomahawk/playlist/TrackView.cpp
@@ -661,10 +661,7 @@ TrackView::onCustomContextMenu( const QPoint& pos )
         PlayableItem* item = proxyModel()->itemFromIndex( proxyModel()->mapToSource( index ) );
         if ( item && !item->query().isNull() )
         {
-            if ( item->query()->numResults() > 0 )
-                queries << item->query()->results().first()->toQuery();
-            else
-                queries << item->query();
+            queries << item->query();
         }
     }
 
diff --git a/src/libtomahawk/sip/SipInfo.cpp b/src/libtomahawk/sip/SipInfo.cpp
index 466dd3f15..016289602 100644
--- a/src/libtomahawk/sip/SipInfo.cpp
+++ b/src/libtomahawk/sip/SipInfo.cpp
@@ -60,7 +60,7 @@ SipInfo::SipInfo()
 }
 
 
-SipInfo::SipInfo(const SipInfo& other)
+SipInfo::SipInfo( const SipInfo& other )
     : QObject()
     , d( other.d )
 {
diff --git a/src/libtomahawk/sip/SipStatusMessage.cpp b/src/libtomahawk/sip/SipStatusMessage.cpp
index ffe7fbb6a..bf7588c66 100644
--- a/src/libtomahawk/sip/SipStatusMessage.cpp
+++ b/src/libtomahawk/sip/SipStatusMessage.cpp
@@ -24,8 +24,8 @@
 #include <QTimer>
 
 SipStatusMessage::SipStatusMessage( SipStatusMessageType statusMessageType, const QString& contactId, const QString& message )
-    : m_statusMessageType( statusMessageType )
-    , m_contactId( contactId )
+    : m_contactId( contactId )
+    , m_statusMessageType( statusMessageType )
     , m_message( message )
 {
     // make this temporary for now, as soon as i know how: add ack button