diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp
index aff583e61..fdac7206e 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp
@@ -746,6 +746,7 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
         if ( !track )
             continue;
 
+        rp->setTrack( track );
         rp->setBitrate( m.value( "bitrate" ).toUInt() );
         rp->setSize( m.value( "size" ).toUInt() );
         rp->setRID( uuid() );
@@ -754,11 +755,12 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
         rp->setLinkUrl( m.value( "linkUrl" ).toString() );
         rp->setScore( m.value( "score" ).toFloat() );
 
+        //FIXME
         if ( m.contains( "year" ) )
         {
             QVariantMap attr;
             attr[ "releaseyear" ] = m.value( "year" );
-            rp->setAttributes( attr );
+//            rp->track()->setAttributes( attr );
         }
 
         rp->setMimetype( m.value( "mimetype" ).toString() );
@@ -768,7 +770,6 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
             Q_ASSERT( !rp->mimetype().isEmpty() );
         }
 
-        rp->setTrack( track );
         rp->setResolvedBy( this );
         results << rp;
     }
@@ -776,6 +777,7 @@ QtScriptResolver::parseResultVariantList( const QVariantList& reslist )
     return results;
 }
 
+
 QList< Tomahawk::artist_ptr >
 QtScriptResolver::parseArtistVariantList( const QVariantList& reslist )
 {
diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp
index dd47f4acb..3f2247090 100644
--- a/src/libtomahawk/resolvers/ScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/ScriptResolver.cpp
@@ -290,7 +290,14 @@ ScriptResolver::handleMsg( const QByteArray& msg )
             rp->setFriendlySource( m_name );
             rp->setPurchaseUrl( m.value( "purchaseUrl" ).toString() );
             rp->setLinkUrl( m.value( "linkUrl" ).toString() );
-            rp->setYear( m.value( "year").toUInt() );
+
+            //FIXME
+            if ( m.contains( "year" ) )
+            {
+                QVariantMap attr;
+                attr[ "releaseyear" ] = m.value( "year" );
+//                rp->track()->setAttributes( attr );
+            }
 
             rp->setMimetype( m.value( "mimetype" ).toString() );
             if ( rp->mimetype().isEmpty() )