diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
index 0a291aa44..32ed2d2bc 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp
@@ -114,6 +114,7 @@ Tomahawk::EchonestControl::updateWidgets()
         match->addItem( "Limit To", Echonest::DynamicPlaylist::ArtistType );
         match->addItem( "Similar To", Echonest::DynamicPlaylist::ArtistRadioType );
         m_matchString = match->currentText();
+        m_matchData = match->itemData( match->currentIndex() ).toString();
         
         input->setPlaceholderText( "Artist name" );
         input->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Fixed );
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
index a405898af..d1d5471c3 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlList.cpp
@@ -163,7 +163,7 @@ DynamicControlList::onShown( QWidget* w )
         m_layout->addWidget( control );
     }
     
-    m_layout->addLayout( m_collapseLayout );
+    m_layout->addItem( m_collapseLayout );
     m_layout->setStretchFactor( m_collapseLayout, 1 );
     
     AnimatedWidget::onShown( w );
@@ -174,7 +174,6 @@ void DynamicControlList::addNewControl()
     dyncontrol_ptr control = m_generator->createControl();
     m_controls.append( new DynamicControlWidget( control, m_isLocal, this ) );
     m_layout->addWidget( m_controls.last() );
-    connect( m_controls.last(), SIGNAL( addNewControl() ), this, SLOT( addNewControl() ) );
     connect( m_controls.last(), SIGNAL( removeControl() ), this, SLOT( removeControl() ) );
     connect( m_controls.last(), SIGNAL( changed() ), this, SLOT( controlChanged() ) );
     
diff --git a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWidget.cpp b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWidget.cpp
index 1b611cbcd..1d7bc8f82 100644
--- a/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWidget.cpp
+++ b/src/libtomahawk/playlist/dynamic/widgets/DynamicControlWidget.cpp
@@ -190,7 +190,6 @@ DynamicControlWidget::mouseMoveEvent(QMouseEvent* ev)
     enterEvent( ev );
 }
 
-
 void 
 DynamicControlWidget::paintEvent(QPaintEvent* )
 {