diff --git a/src/baloo/localbaloofilelisting.cpp b/src/baloo/localbaloofilelisting.cpp
index f0127494..92014d2a 100644
--- a/src/baloo/localbaloofilelisting.cpp
+++ b/src/baloo/localbaloofilelisting.cpp
@@ -1,202 +1,190 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "localbaloofilelisting.h"
 
 #include "musicaudiotrack.h"
 
 #include <Baloo/Query>
 #include <Baloo/File>
 
 #include <KFileMetaData/Properties>
 
 #include <QDBusConnection>
 
 #include <QThread>
 #include <QDebug>
 #include <QHash>
 #include <QFileInfo>
 #include <QDir>
 
 #include <algorithm>
 
 class LocalBalooFileListingPrivate
 {
 public:
 
     Baloo::Query mQuery;
 
     QHash<QString, QVector<MusicAudioTrack>> mAllAlbums;
 
     QHash<QString, QVector<MusicAudioTrack>> mNewAlbums;
 
     QList<MusicAudioTrack> mNewTracks;
 
     QHash<QString, QUrl> mAllAlbumCover;
 
     QString mSourceName = QStringLiteral("baloo");
 
 };
 
 LocalBalooFileListing::LocalBalooFileListing(QObject *parent) : QObject(parent), d(new LocalBalooFileListingPrivate)
 {
     d->mQuery.addType(QStringLiteral("Audio"));
 }
 
 LocalBalooFileListing::~LocalBalooFileListing()
 {
 }
 
 void LocalBalooFileListing::init()
 {
     QDBusConnection con = QDBusConnection::sessionBus();
 
     bool connectResult = con.connect(QString(), QStringLiteral("/fileindexer"), QStringLiteral("org.kde.baloo.fileindexer"),
                                 QStringLiteral("finishedIndexingFile"), this, SLOT(slotFinishedIndexingFile(QString)));
 
     if (!connectResult) {
         qDebug() << "problem with baloo monitoring";
     }
 
     connectResult = con.connect(QString(), QStringLiteral("/files"), QStringLiteral("org.kde"),
                 QStringLiteral("changed"), this, SLOT(slotFileMetaDataChanged(QStringList)));
 
     if (!connectResult) {
         qDebug() << "problem with baloo monitoring";
     }
 }
 
 void LocalBalooFileListing::databaseIsReady()
 {
     Q_EMIT initialTracksListRequired(d->mSourceName);
 }
 
 void LocalBalooFileListing::initialTracksList(QString musicSource, QList<MusicAudioTrack> initialList)
 {
-    if (musicSource == d->mSourceName) {
-        d->mAllAlbums.clear();
-        d->mAllAlbumCover.clear();
-
-        qDebug() << "LocalBalooFileListing::initialTracksList" << initialList.count();
-
-        const auto &constInitialList = initialList;
-        for (const auto &oneTrack : constInitialList) {
-            d->mAllAlbums[oneTrack.albumName()].push_back(oneTrack);
-            d->mNewTracks.push_back(oneTrack);
-            d->mAllAlbumCover[oneTrack.albumName()] = oneTrack.albumCover();
-        }
-
-        qDebug() << "LocalBalooFileListing::initialTracksList" << d->mAllAlbums.count();
+    Q_UNUSED(initialList);
 
+    if (musicSource == d->mSourceName) {
         refreshContent();
     }
 }
 
 void LocalBalooFileListing::slotFinishedIndexingFile(QString fileName)
 {
     Q_UNUSED(fileName);
 }
 
 void LocalBalooFileListing::slotFileMetaDataChanged(QStringList fileList)
 {
     Q_UNUSED(fileList);
 }
 
 void LocalBalooFileListing::refreshContent()
 {
     auto resultIterator = d->mQuery.exec();
 
     int cptTracks = 0;
 
     while(resultIterator.next()) {
         Baloo::File match(resultIterator.filePath());
         match.load();
 
         const auto &allProperties = match.properties();
 
         auto titleProperty = allProperties.find(KFileMetaData::Property::Title);
         auto durationProperty = allProperties.find(KFileMetaData::Property::Duration);
         auto artistProperty = allProperties.find(KFileMetaData::Property::Artist);
         auto albumProperty = allProperties.find(KFileMetaData::Property::Album);
         auto albumArtistProperty = allProperties.find(KFileMetaData::Property::AlbumArtist);
         auto trackNumberProperty = allProperties.find(KFileMetaData::Property::TrackNumber);
 
         if (albumProperty != allProperties.end()) {
             auto albumValue = albumProperty->toString();
             auto &allTracks = d->mAllAlbums[albumValue];
 
             MusicAudioTrack newTrack;
 
             newTrack.setAlbumName(albumValue);
             ++cptTracks;
 
             if (artistProperty != allProperties.end()) {
                 newTrack.setArtist(artistProperty->toString());
             }
 
             if (durationProperty != allProperties.end()) {
                 newTrack.setDuration(QTime::fromMSecsSinceStartOfDay(1000 * durationProperty->toDouble()));
             }
 
             if (titleProperty != allProperties.end()) {
                 newTrack.setTitle(titleProperty->toString());
             }
 
             if (trackNumberProperty != allProperties.end()) {
                 newTrack.setTrackNumber(trackNumberProperty->toInt());
             }
 
             if (albumArtistProperty != allProperties.end()) {
                 newTrack.setAlbumArtist(albumArtistProperty->toString());
             }
 
             if (newTrack.albumArtist().isEmpty()) {
                 newTrack.setAlbumArtist(newTrack.artist());
             }
 
             if (newTrack.artist().isEmpty()) {
                 newTrack.setArtist(newTrack.albumArtist());
             }
 
             newTrack.setResourceURI(QUrl::fromLocalFile(resultIterator.filePath()));
             QFileInfo trackFilePath(resultIterator.filePath());
             QFileInfo coverFilePath(trackFilePath.dir().filePath(QStringLiteral("cover.jpg")));
             if (coverFilePath.exists()) {
                 d->mAllAlbumCover[albumValue] = QUrl::fromLocalFile(coverFilePath.absoluteFilePath());
             }
 
             auto itTrack = std::find(allTracks.begin(), allTracks.end(), newTrack);
             if (itTrack == allTracks.end()) {
                 allTracks.push_back(newTrack);
                 d->mNewTracks.push_back(newTrack);
                 d->mNewAlbums[newTrack.albumName()].push_back(newTrack);
 
                 auto &newTracks = d->mAllAlbums[newTrack.albumName()];
 
                 std::sort(allTracks.begin(), allTracks.end());
                 std::sort(newTracks.begin(), newTracks.end());
             }
         }
     }
 
     Q_EMIT tracksList(d->mNewTracks, d->mAllAlbumCover, d->mSourceName);
 }
 
 
 #include "moc_localbaloofilelisting.cpp"