diff --git a/src/libtomahawk/Query.cpp b/src/libtomahawk/Query.cpp
index 9b8c8e391..8326667cc 100644
--- a/src/libtomahawk/Query.cpp
+++ b/src/libtomahawk/Query.cpp
@@ -36,7 +36,6 @@
 #include "audio/AudioEngine.h"
 
 #include "utils/Logger.h"
-#include "utils/WebResultHintChecker.h"
 
 using namespace Tomahawk;
 
@@ -777,9 +776,6 @@ void
 Query::setSaveHTTPResultHint( bool saveResultHint )
 {
     m_saveResultHint = saveResultHint;
-
-    // Make sure it's a valid url
-    new WebResultHintChecker( m_ownRef.toStrongRef() );
 }
 
 
diff --git a/src/libtomahawk/playlist/PlaylistModel.cpp b/src/libtomahawk/playlist/PlaylistModel.cpp
index f5724aaa4..9047cbf25 100644
--- a/src/libtomahawk/playlist/PlaylistModel.cpp
+++ b/src/libtomahawk/playlist/PlaylistModel.cpp
@@ -1,7 +1,8 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
- *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.o
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>rg>
+ *   Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -34,6 +35,7 @@
 #include "PlayableItem.h"
 #include "utils/TomahawkUtils.h"
 #include "utils/Logger.h"
+#include <utils/WebResultHintChecker.h>
 
 using namespace Tomahawk;
 
@@ -236,6 +238,8 @@ PlaylistModel::insertEntries( const QList< Tomahawk::plentry_ptr >& entries, int
         }
 
         connect( plitem, SIGNAL( dataChanged() ), SLOT( onDataChanged() ) );
+
+        WebResultHintChecker::checkQuery( entry->query() );
     }
 
     if ( !m_waitingForResolved.isEmpty() )