diff --git a/src/models/gridviewproxymodel.cpp b/src/models/gridviewproxymodel.cpp
index ec12de86..77496653 100644
--- a/src/models/gridviewproxymodel.cpp
+++ b/src/models/gridviewproxymodel.cpp
@@ -1,116 +1,146 @@
 /*
  * Copyright 2016-2017 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  * Copyright 2017 Alexander Stippich <a.stippich@gmx.net>
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
  *
  * This program 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
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include "gridviewproxymodel.h"
 
 #include "datatypes.h"
 #include "elisautils.h"
 
 #include <QStringList>
 #include <QReadLocker>
 #include <QtConcurrentRun>
 
 GridViewProxyModel::GridViewProxyModel(QObject *parent) : AbstractMediaProxyModel(parent)
 {
     setSortRole(Qt::DisplayRole);
     setSortCaseSensitivity(Qt::CaseInsensitive);
     sortModel(Qt::AscendingOrder);
 }
 
 ElisaUtils::PlayListEntryType GridViewProxyModel::dataType() const
 {
     return mDataType;
 }
 
 GridViewProxyModel::~GridViewProxyModel() = default;
 
 bool GridViewProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     bool result = false;
 
     auto currentIndex = sourceModel()->index(source_row, 0, source_parent);
 
     const auto &mainValue = sourceModel()->data(currentIndex, Qt::DisplayRole).toString();
     const auto &artistValue = sourceModel()->data(currentIndex, DataTypes::ArtistRole).toString();
     const auto &allArtistsValue = sourceModel()->data(currentIndex, DataTypes::AllArtistsRole).toStringList();
     const auto maximumRatingValue = sourceModel()->data(currentIndex, DataTypes::HighestTrackRating).toInt();
 
     if (maximumRatingValue < mFilterRating) {
         result = false;
         return result;
     }
 
     if (mFilterExpression.match(mainValue).hasMatch()) {
         result = true;
         return result;
     }
 
     if (mFilterExpression.match(artistValue).hasMatch()) {
         result = true;
         return result;
     }
 
     for (const auto &oneArtist : allArtistsValue) {
         if (mFilterExpression.match(oneArtist).hasMatch()) {
             result = true;
             return result;
         }
     }
 
     return result;
 }
 
 void GridViewProxyModel::genericEnqueueToPlayList(ElisaUtils::PlayListEnqueueMode enqueueMode,
                                                    ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
 {
     QtConcurrent::run(&mThreadPool, [=] () {
         QReadLocker locker(&mDataLock);
         auto allData = ElisaUtils::EntryDataList{};
         allData.reserve(rowCount());
         for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
             auto currentIndex = index(rowIndex, 0);
-            allData.push_back(ElisaUtils::EntryData{data(currentIndex, DataTypes::FullDataRole).value<DataTypes::TrackDataType>(),
-                                                    data(currentIndex, Qt::DisplayRole).toString(), {}});
+
+            switch (mDataType)
+            {
+            case ElisaUtils::Radio:
+            case ElisaUtils::Track:
+                allData.push_back(ElisaUtils::EntryData{data(currentIndex, DataTypes::FullDataRole).value<DataTypes::TrackDataType>(),
+                                                        data(currentIndex, Qt::DisplayRole).toString(), {}});
+                break;
+            case ElisaUtils::Album:
+                allData.push_back(ElisaUtils::EntryData{{{DataTypes::DatabaseIdRole, data(currentIndex, DataTypes::DatabaseIdRole).toULongLong()},
+                                                         {DataTypes::ImageUrlRole, data(currentIndex, DataTypes::ImageUrlRole).toUrl()},
+                                                         {DataTypes::AlbumArtistRole, data(currentIndex, DataTypes::ArtistRole).toString()},
+                                                         {DataTypes::AlbumRole, data(currentIndex, DataTypes::AlbumRole).toString()}},
+                                                        data(currentIndex, Qt::DisplayRole).toString(), {}});
+                break;
+            case ElisaUtils::Artist:
+                allData.push_back(ElisaUtils::EntryData{{{DataTypes::DatabaseIdRole, data(currentIndex, DataTypes::DatabaseIdRole).toULongLong()},
+                                                         {DataTypes::ImageUrlRole, data(currentIndex, DataTypes::ImageUrlRole).toUrl()},
+                                                         {DataTypes::AlbumArtistRole, data(currentIndex, DataTypes::ArtistRole).toString()},
+                                                         {DataTypes::AlbumRole, {}}},
+                                                        data(currentIndex, Qt::DisplayRole).toString(), {}});
+                break;
+            case ElisaUtils::Genre:
+            case ElisaUtils::Lyricist:
+            case ElisaUtils::Composer:
+            case ElisaUtils::FileName:
+                allData.push_back(ElisaUtils::EntryData{{{DataTypes::DatabaseIdRole, data(currentIndex, DataTypes::DatabaseIdRole).toULongLong()}},
+                                                        data(currentIndex, Qt::DisplayRole).toString(), {}});
+                break;
+            case ElisaUtils::Unknown:
+                break;
+            }
         }
         Q_EMIT entriesToEnqueue(allData, mDataType, enqueueMode, triggerPlay);
     });
 }
 
 void GridViewProxyModel::enqueueToPlayList()
 {
     genericEnqueueToPlayList(ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
 }
 
 void GridViewProxyModel::replaceAndPlayOfPlayList()
 {
     genericEnqueueToPlayList(ElisaUtils::ReplacePlayList, ElisaUtils::TriggerPlay);
 }
 
 void GridViewProxyModel::setDataType(ElisaUtils::PlayListEntryType newDataType)
 {
     if (mDataType == newDataType) {
         return;
     }
 
     mDataType = newDataType;
 
     Q_EMIT dataTypeChanged();
 }
 
 
 #include "moc_gridviewproxymodel.cpp"