diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index feb366e8..873a9974 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,502 +1,501 @@
 include_directories(${elisa_BINARY_DIR})
 
 set(elisaLib_SOURCES
     mediaplaylist.cpp
     mediaplaylistproxymodel.cpp
     progressindicator.cpp
     databaseinterface.cpp
     datatypes.cpp
     musiclistenersmanager.cpp
     managemediaplayercontrol.cpp
     manageheaderbar.cpp
     manageaudioplayer.cpp
     trackslistener.cpp
     elisaapplication.cpp
     modeldataloader.cpp
     elisautils.cpp
     abstractfile/abstractfilelistener.cpp
     abstractfile/abstractfilelisting.cpp
     filescanner.cpp
     filewriter.cpp
     viewmanager.cpp
     powermanagementinterface.cpp
     file/filelistener.cpp
     file/localfilelisting.cpp
     models/datamodel.cpp
     models/abstractmediaproxymodel.cpp
     models/gridviewproxymodel.cpp
     models/alltracksproxymodel.cpp
-    models/singlealbumproxymodel.cpp
     models/trackmetadatamodel.cpp
     models/editabletrackmetadatamodel.cpp
     models/trackcontextmetadatamodel.cpp
     models/viewsmodel.cpp
     localFileConfiguration/elisaconfigurationdialog.cpp
 )
 
 ecm_qt_declare_logging_category(elisaLib_SOURCES
     HEADER "indexersManager.h"
     IDENTIFIER "orgKdeElisaIndexersManager"
     CATEGORY_NAME "org.kde.elisa.indexers.manager"
     DEFAULT_SEVERITY Info
     )
 
 ecm_qt_declare_logging_category(elisaLib_SOURCES
     HEADER "databaseLogging.h"
     IDENTIFIER "orgKdeElisaDatabase"
     CATEGORY_NAME "org.kde.elisa.database"
     DEFAULT_SEVERITY Info
     )
 
 ecm_qt_declare_logging_category(elisaLib_SOURCES
     HEADER "abstractfile/indexercommon.h"
     IDENTIFIER "orgKdeElisaIndexer"
     CATEGORY_NAME "org.kde.elisa.indexer"
     DEFAULT_SEVERITY Info
     )
 
 ecm_qt_declare_logging_category(elisaLib_SOURCES
     HEADER "models/modelLogging.h"
     IDENTIFIER "orgKdeElisaModel"
     CATEGORY_NAME "org.kde.elisa.model"
     DEFAULT_SEVERITY Info
     )
 
 ecm_qt_declare_logging_category(elisaLib_SOURCES
     HEADER "playListLogging.h"
     IDENTIFIER "orgKdeElisaPlayList"
     CATEGORY_NAME "org.kde.elisa.playlist"
     DEFAULT_SEVERITY Info
     )
 
 if (LIBVLC_FOUND)
     ecm_qt_declare_logging_category(elisaLib_SOURCES
         HEADER "vlcLogging.h"
         IDENTIFIER "orgKdeElisaPlayerVlc"
         CATEGORY_NAME "org.kde.elisa.player.vlc"
         DEFAULT_SEVERITY Info
         )
 
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         audiowrapper_libvlc.cpp
         )
 else()
     ecm_qt_declare_logging_category(elisaLib_SOURCES
         HEADER "qtMultimediaLogging.h"
         IDENTIFIER "orgKdeElisaPlayerQtMultimedia"
         CATEGORY_NAME "org.kde.elisa.player.qtMultimedia"
         DEFAULT_SEVERITY Info
         )
 
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         audiowrapper_qtmultimedia.cpp
         )
 endif()
 
 if (ANDROID)
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         android/androidmusiclistener.cpp
         )
 endif()
 
 if (KF5KIO_FOUND)
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         models/filebrowsermodel.cpp
         models/filebrowserproxymodel.cpp
         )
 endif()
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         ecm_qt_declare_logging_category(elisaLib_SOURCES
             HEADER "baloo/baloocommon.h"
             IDENTIFIER "orgKdeElisaBaloo"
             CATEGORY_NAME "org.kde.elisa.baloo"
             DEFAULT_SEVERITY Info
             )
 
         set(elisaLib_SOURCES
             ${elisaLib_SOURCES}
             baloo/localbaloofilelisting.cpp
             baloo/baloolistener.cpp
             baloo/baloodetector.cpp
             )
 
         qt5_add_dbus_interface(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.main.xml
             baloo/main)
 
         qt5_add_dbus_interface(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         qt5_add_dbus_adaptor(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.BalooWatcherApplication.xml
             baloo/localbaloofilelisting.h LocalBalooFileListing)
     endif()
 endif()
 
 if (Qt5DBus_FOUND)
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         mpris2/mpris2.cpp
         mpris2/mediaplayer2.cpp
         mpris2/mediaplayer2player.cpp
         )
 endif()
 
 if (UPNPQT_FOUND)
     set(elisaLib_SOURCES
         ${elisaLib_SOURCES}
         upnp/upnpcontrolcontentdirectory.cpp
         upnp/upnpcontentdirectorymodel.cpp
         upnp/upnpcontrolconnectionmanager.cpp
         upnp/upnpcontrolmediaserver.cpp
         upnp/didlparser.cpp
         upnp/upnplistener.cpp
         upnp/upnpdiscoverallmusic.cpp
         )
 endif()
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         qt5_add_dbus_interface(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.fileindexer.xml
             baloo/fileindexer)
 
         qt5_add_dbus_interface(elisaLib_SOURCES
             ${BALOO_DBUS_INTERFACES_DIR}/org.kde.baloo.scheduler.xml
             baloo/scheduler)
 
         set(elisaLib_SOURCES
             ${elisaLib_SOURCES}
             ../src/baloo/baloolistener.cpp
             ../src/baloo/localbaloofilelisting.cpp
             )
     endif()
 endif()
 
 kconfig_add_kcfg_files(elisaLib_SOURCES ../src/elisa_settings.kcfgc )
 set(elisaLib_SOURCES
     ${elisaLib_SOURCES}
     ../src/elisa_core.kcfg
     )
 
 add_library(elisaLib ${elisaLib_SOURCES})
 target_link_libraries(elisaLib
     LINK_PUBLIC
     Qt5::Multimedia
     LINK_PRIVATE
     Qt5::Core Qt5::Sql Qt5::Widgets Qt5::Concurrent Qt5::Qml
     KF5::I18n KF5::CoreAddons
     KF5::ConfigCore KF5::ConfigGui)
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaLib
         LINK_PRIVATE
         KF5::FileMetaData
         )
 endif()
 
 if (KF5KIO_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets
         )
 endif()
 
 if (KF5XmlGui_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         KF5::XmlGui
         )
 endif()
 
 if (KF5ConfigWidgets_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         KF5::ConfigWidgets
         )
 endif()
 
 if (KF5KCMUtils_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         KF5::KCMUtils
         )
 endif()
 
 if (KF5Baloo_FOUND)
     if (Qt5DBus_FOUND)
         target_link_libraries(elisaLib
             LINK_PUBLIC
             KF5::Baloo
             )
     endif()
 endif()
 
 if (Qt5DBus_FOUND)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         Qt5::DBus
         )
 
     if (KF5DBusAddons_FOUND)
         target_link_libraries(elisaLib
             LINK_PUBLIC
             KF5::DBusAddons
             )
     endif()
 endif()
 
 if (LIBVLC_FOUND)
     target_include_directories(elisaLib
         PRIVATE
         ${LIBVLC_INCLUDE_DIR}
         )
 
     target_link_libraries(elisaLib
         LINK_PRIVATE
         ${LIBVLC_LIBRARY}
         )
 endif()
 
 if (ANDROID)
     target_link_libraries(elisaLib
         LINK_PUBLIC
         Qt5::AndroidExtras
         )
 endif()
 
 generate_export_header(elisaLib BASE_NAME ElisaLib EXPORT_FILE_NAME elisaLib_export.h)
 
 set_target_properties(elisaLib PROPERTIES
     VERSION 0.1
     SOVERSION 0
     EXPORT_NAME ElisaLib
     )
 
 if (NOT APPLE AND NOT WIN32)
     install(TARGETS elisaLib
         LIBRARY DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa NAMELINK_SKIP
         RUNTIME DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa
         BUNDLE DESTINATION ${KDE_INSTALL_FULL_LIBDIR}/elisa
         )
 else()
     install(TARGETS elisaLib ${INSTALL_TARGETS_DEFAULT_ARGS})
 endif()
 
 set(elisaqmlplugin_SOURCES
     elisaqmlplugin.cpp
     elisautils.cpp
 )
 
 if (KF5FileMetaData_FOUND)
     set(elisaqmlplugin_SOURCES
         ${elisaqmlplugin_SOURCES}
         embeddedcoverageimageprovider.cpp
     )
 endif()
 
 add_library(elisaqmlplugin SHARED ${elisaqmlplugin_SOURCES})
 target_link_libraries(elisaqmlplugin
     LINK_PRIVATE
     Qt5::Quick Qt5::Widgets
     KF5::ConfigCore KF5::ConfigGui
     elisaLib
     )
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaqmlplugin
         LINK_PRIVATE
         KF5::FileMetaData
         )
 endif()
 
 set_target_properties(elisaqmlplugin PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/org/kde/elisa
     )
 
 if (NOT APPLE AND NOT WIN32)
     set_target_properties(elisaqmlplugin PROPERTIES
         INSTALL_RPATH "${KDE_INSTALL_FULL_LIBDIR}/elisa;${CMAKE_INSTALL_RPATH}"
         )
 endif()
 
 install(TARGETS elisaqmlplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/elisa/)
 
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/elisa)
 
 add_custom_target(copy)
 add_custom_target(copy2)
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/org/kde/elisa)
 
 add_custom_command(TARGET copy PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E
     copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_BINARY_DIR}/bin/org/kde/elisa/)
 
 add_custom_command(TARGET copy2 PRE_BUILD
     COMMAND ${CMAKE_COMMAND} -E
     copy ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes ${CMAKE_BINARY_DIR}/bin/org/kde/elisa/)
 
 add_dependencies(elisaqmlplugin copy copy2)
 
 if (Qt5Quick_FOUND AND Qt5Widgets_FOUND)
     set(elisa_SOURCES
         main.cpp
 
         windows/WindowsTheme.qml
         windows/PlatformIntegration.qml
 
         android/ElisaMainWindow.qml
         android/AndroidTheme.qml
         android/PlatformIntegration.qml
         android/AlbumsView.qml
         android/ArtistsView.qml
         android/TracksView.qml
         android/GenresView.qml
 
         qml/ElisaMainWindow.qml
         qml/ApplicationMenu.qml
         qml/NativeApplicationMenu.qml
         qml/BaseTheme.qml
         qml/Theme.qml
         qml/PlatformIntegration.qml
         qml/LabelWithToolTip.qml
 
         qml/RatingStar.qml
         qml/DraggableItem.qml
         qml/TrackImportNotification.qml
         qml/ImageWithFallback.qml
 
         qml/HeaderBar.qml
         qml/NavigationActionBar.qml
         qml/MediaPlayerControl.qml
         qml/ContextView.qml
         qml/ContentView.qml
         qml/ViewSelector.qml
         qml/ViewSelectorDelegate.qml
         qml/DataGridView.qml
         qml/DataListView.qml
 
         qml/MediaPlayListView.qml
         qml/PlayListBasicView.qml
         qml/PlayListEntry.qml
         qml/SimplePlayListView.qml
         qml/BasicPlayListAlbumHeader.qml
 
         qml/MetaDataDelegate.qml
         qml/EditableMetaDataDelegate.qml
         qml/TracksDiscHeader.qml
         qml/MediaTrackMetadataView.qml
         qml/GridBrowserView.qml
         qml/GridBrowserDelegate.qml
         qml/ListBrowserView.qml
         qml/ListBrowserDelegate.qml
         qml/FileBrowserView.qml
         qml/ScrollHelper.qml
         qml/FlatButtonWithToolTip.qml
         qml/HeaderFooterToolbar.qml
 
         qml/ElisaConfigurationDialog.qml
         qml/FileScanningConfiguration.qml
         qml/GeneralConfiguration.qml
     )
 
     qt5_add_resources(elisa_SOURCES resources.qrc)
     set_property(SOURCE qrc_resources.cpp PROPERTY SKIP_AUTOMOC ON)
 
     set(elisa_ICONS_PNG
         ../icons/128-apps-elisa.png
         ../icons/64-apps-elisa.png
         ../icons/48-apps-elisa.png
         ../icons/32-apps-elisa.png
         ../icons/22-apps-elisa.png
         ../icons/16-apps-elisa.png
         )
 
     # add icons to application sources, to have them bundled
     ecm_add_app_icon(elisa_SOURCES ICONS ${elisa_ICONS_PNG})
 
     add_executable(elisa ${elisa_SOURCES})
 
     target_include_directories(elisa PRIVATE ${KDSoap_INCLUDE_DIRS})
 
     target_link_libraries(elisa
         LINK_PRIVATE
         elisaLib
         Qt5::Widgets Qt5::QuickControls2
         KF5::I18n KF5::CoreAddons KF5::ConfigCore KF5::ConfigGui
         )
 
     if (ANDROID)
         target_link_libraries(elisa
             LINK_PRIVATE
             Qt5::AndroidExtras Qt5::Svg Qt5::Sql Qt5::Concurrent KF5::Kirigami2
         )
     endif()
 
     if (KF5Crash_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
             KF5::Crash
             )
     endif()
 
     if (KF5Declarative_FOUND)
         target_link_libraries(elisa
             LINK_PRIVATE
             KF5::Declarative
             KF5::QuickAddons
             )
     endif()
 
     if (NOT APPLE AND NOT WIN32)
         set_target_properties(elisa PROPERTIES
             INSTALL_RPATH "${KDE_INSTALL_FULL_LIBDIR}/elisa;${CMAKE_INSTALL_RPATH}"
             )
     endif()
 
     install(TARGETS elisa ${INSTALL_TARGETS_DEFAULT_ARGS})
 endif()
 
 set(elisaImport_SOURCES
     elisaimport.cpp
     elisaimportapplication.cpp
     )
 
 kconfig_add_kcfg_files(elisaImport_SOURCES ../src/elisa_settings.kcfgc )
 set(elisaImport_SOURCES
     ${elisaImport_SOURCES}
     ../src/elisa_core.kcfg
     )
 
 add_executable(elisaImport ${elisaImport_SOURCES})
 
 target_link_libraries(elisaImport
     LINK_PRIVATE
     KF5::ConfigCore KF5::ConfigGui
     elisaLib
     )
 
 if (KF5FileMetaData_FOUND)
     target_link_libraries(elisaImport
         LINK_PRIVATE
         KF5::FileMetaData
         )
 endif()
 
 set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "qml import path" FORCE)
 
 if (ANDROID)
     kirigami_package_breeze_icons(ICONS elisa)
 endif()
diff --git a/src/elisaqmlplugin.cpp b/src/elisaqmlplugin.cpp
index abacf72e..debe265c 100644
--- a/src/elisaqmlplugin.cpp
+++ b/src/elisaqmlplugin.cpp
@@ -1,188 +1,186 @@
 /*
  * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
  *
  * 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 "elisaqmlplugin.h"
 
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
 #include "upnp/upnpcontrolconnectionmanager.h"
 #include "upnp/upnpcontrolmediaserver.h"
 #include "upnp/upnpcontrolcontentdirectory.h"
 #include "upnp/upnpcontentdirectorymodel.h"
 #include "upnpdevicedescription.h"
 #include "upnp/didlparser.h"
 #include "upnp/upnpdiscoverallmusic.h"
 
 #include "upnpssdpengine.h"
 #include "upnpabstractservice.h"
 #include "upnpcontrolabstractdevice.h"
 #include "upnpcontrolabstractservice.h"
 #include "upnpbasictypes.h"
 #endif
 
 #include "elisautils.h"
 #include "elisaapplication.h"
 #include "progressindicator.h"
 #include "mediaplaylist.h"
 #include "mediaplaylistproxymodel.h"
 #include "managemediaplayercontrol.h"
 #include "manageheaderbar.h"
 #include "manageaudioplayer.h"
 #include "musiclistenersmanager.h"
 #include "trackslistener.h"
 #include "viewmanager.h"
 #include "databaseinterface.h"
 #include "datatypes.h"
 #include "models/datamodel.h"
 #include "models/trackmetadatamodel.h"
 #include "models/trackcontextmetadatamodel.h"
 #include "models/editabletrackmetadatamodel.h"
 #include "models/viewsmodel.h"
 #include "models/gridviewproxymodel.h"
 #include "models/alltracksproxymodel.h"
-#include "models/singlealbumproxymodel.h"
 #include "localFileConfiguration/elisaconfigurationdialog.h"
 
 #if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND
 #include "embeddedcoverageimageprovider.h"
 #endif
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
 #include "models/filebrowsermodel.h"
 #include "models/filebrowserproxymodel.h"
 #endif
 
 #include "audiowrapper.h"
 
 #if defined Qt5DBus_FOUND && Qt5DBus_FOUND
 #include "mpris2/mpris2.h"
 #include "mpris2/mediaplayer2player.h"
 #endif
 
 
 #include <QAction>
 #include <QStandardPaths>
 
 #include <QQmlExtensionPlugin>
 #include <QQmlEngine>
 
 ElisaQmlTestPlugin::ElisaQmlTestPlugin(QObject *aParent)
     : QQmlExtensionPlugin(aParent)
 {
 }
 
 void ElisaQmlTestPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
 #if defined KF5FileMetaData_FOUND && KF5FileMetaData_FOUND
     engine->addImageProvider(QStringLiteral("cover"), new EmbeddedCoverageImageProvider);
 #endif
 }
 
 void ElisaQmlTestPlugin::registerTypes(const char *uri)
 {
 #if defined UPNPQT_FOUND && UPNPQT_FOUND
     qmlRegisterType<UpnpSsdpEngine>(uri, 1, 0, "UpnpSsdpEngine");
     qmlRegisterType<UpnpDiscoverAllMusic>(uri, 1, 0, "UpnpDiscoverAllMusic");
 
     qmlRegisterType<UpnpAbstractDevice>(uri, 1, 0, "UpnpAbstractDevice");
     qmlRegisterType<UpnpAbstractService>(uri, 1, 0, "UpnpAbstractService");
     qmlRegisterType<UpnpControlAbstractDevice>(uri, 1, 0, "UpnpControlAbstractDevice");
     qmlRegisterType<UpnpControlAbstractService>(uri, 1, 0, "UpnpControlAbstractService");
     qmlRegisterType<UpnpControlConnectionManager>(uri, 1, 0, "UpnpControlConnectionManager");
     qmlRegisterType<UpnpControlMediaServer>(uri, 1, 0, "UpnpControlMediaServer");
     qmlRegisterType<UpnpContentDirectoryModel>(uri, 1, 0, "UpnpContentDirectoryModel");
     qmlRegisterType<DidlParser>(uri, 1, 0, "DidlParser");
     qmlRegisterType<UpnpControlContentDirectory>(uri, 1, 0, "UpnpControlContentDirectory");
     qmlRegisterType<UpnpDeviceDescription>(uri, 1, 0, "UpnpDeviceDescription");
 
     qRegisterMetaType<A_ARG_TYPE_InstanceID>();
     qRegisterMetaType<QPointer<UpnpAbstractDevice> >();
     qRegisterMetaType<UpnpControlConnectionManager*>();
     qRegisterMetaType<UpnpContentDirectoryModel*>();
     qRegisterMetaType<UpnpDeviceDescription*>();
 #endif
 
     qmlRegisterType<MediaPlayList>(uri, 1, 0, "MediaPlayList");
     qmlRegisterType<MediaPlayListProxyModel>(uri, 1, 0, "MediaPlayListProxyModel");
     qmlRegisterType<ManageMediaPlayerControl>(uri, 1, 0, "ManageMediaPlayerControl");
     qmlRegisterType<ManageHeaderBar>(uri, 1, 0, "ManageHeaderBar");
     qmlRegisterType<ManageAudioPlayer>(uri, 1, 0, "ManageAudioPlayer");
     qmlRegisterType<ProgressIndicator>(uri, 1, 0, "ProgressIndicator");
     qmlRegisterType<MusicListenersManager>(uri, 1, 0, "MusicListenersManager");
     qmlRegisterType<ViewManager>(uri, 1, 0, "ViewManager");
     qmlRegisterType<DataModel>(uri, 1, 0, "DataModel");
     qmlRegisterType<TrackMetadataModel>(uri, 1, 0, "TrackMetadataModel");
     qmlRegisterType<TrackContextMetaDataModel>(uri, 1, 0, "TrackContextMetaDataModel");
     qmlRegisterType<EditableTrackMetadataModel>(uri, 1, 0, "EditableTrackMetadataModel");
     qmlRegisterType<ViewsModel>(uri, 1, 0, "ViewsModel");
     qmlRegisterType<GridViewProxyModel>(uri, 1, 0, "GridViewProxyModel");
     qmlRegisterType<AllTracksProxyModel>(uri, 1, 0, "AllTracksProxyModel");
-    qmlRegisterType<SingleAlbumProxyModel>(uri, 1, 0, "SingleAlbumProxyModel");
 
 #if defined KF5KIO_FOUND && KF5KIO_FOUND
     qmlRegisterType<FileBrowserModel>(uri, 1, 0, "FileBrowserModel");
     qmlRegisterType<FileBrowserProxyModel>(uri, 1, 0, "FileBrowserProxyModel");
 #endif
 
     qmlRegisterType<AudioWrapper>(uri, 1, 0, "AudioWrapper");
     qmlRegisterUncreatableType<DatabaseInterface>(uri, 1, 0, "DatabaseInterface", QStringLiteral("Only created in c++"));
 
 #if defined Qt5DBus_FOUND && Qt5DBus_FOUND
     qmlRegisterType<Mpris2>(uri, 1, 0, "Mpris2");
     qRegisterMetaType<MediaPlayer2Player*>();
 #endif
 
     qRegisterMetaType<AbstractMediaProxyModel*>();
     qRegisterMetaType<QHash<QString,QUrl>>("QHash<QString,QUrl>");
     qRegisterMetaType<QHash<QUrl,QDateTime>>("QHash<QUrl,QDateTime>");
     qRegisterMetaType<QVector<qulonglong>>("QVector<qulonglong>");
     qRegisterMetaType<QHash<qulonglong,int>>("QHash<qulonglong,int>");
     qRegisterMetaType<DataTypes::ListTrackDataType>("DataTypes::ListTrackDataType");
     qRegisterMetaType<DataTypes::ListRadioDataType>("DataTypes::ListRadioDataType");
     qRegisterMetaType<DataTypes::ListAlbumDataType>("DataTypes::ListAlbumDataType");
     qRegisterMetaType<DataTypes::ListArtistDataType>("DataTypes::ListArtistDataType");
     qRegisterMetaType<DataTypes::ListGenreDataType>("DataTypes::ListGenreDataType");
     qRegisterMetaType<ModelDataLoader::ListTrackDataType>("ModelDataLoader::ListTrackDataType");
     qRegisterMetaType<ModelDataLoader::ListRadioDataType>("ModelDataLoader::ListRadioDataType");
     qRegisterMetaType<ModelDataLoader::ListAlbumDataType>("ModelDataLoader::ListAlbumDataType");
     qRegisterMetaType<ModelDataLoader::ListArtistDataType>("ModelDataLoader::ListArtistDataType");
     qRegisterMetaType<ModelDataLoader::ListGenreDataType>("ModelDataLoader::ListGenreDataType");
     qRegisterMetaType<ModelDataLoader::AlbumDataType>("ModelDataLoader::AlbumDataType");
     qRegisterMetaType<TracksListener::ListTrackDataType>("TracksListener::ListTrackDataType");
     qRegisterMetaType<QMap<QString, int>>();
     qRegisterMetaType<QAction*>();
     qRegisterMetaType<QMap<QString,int>>("QMap<QString,int>");
     qRegisterMetaType<ElisaUtils::PlayListEnqueueMode>("ElisaUtils::PlayListEnqueueMode");
     qRegisterMetaType<ElisaUtils::PlayListEnqueueTriggerPlay>("ElisaUtils::PlayListEnqueueTriggerPlay");
     qRegisterMetaType<ElisaUtils::PlayListEntryType>("ElisaUtils::PlayListEntryType");
     qRegisterMetaType<ElisaUtils::EntryData>("ElisaUtils::EntryData");
     qRegisterMetaType<ElisaUtils::EntryDataList>("ElisaUtils::EntryDataList");
     qRegisterMetaType<ElisaUtils::FilterType>("ElisaUtils::FilterType");
     qRegisterMetaType<DataTypes::TrackDataType>("DataTypes::TrackDataType");
     qRegisterMetaType<DataTypes::AlbumDataType>("DataTypes::AlbumDataType");
     qRegisterMetaType<DataTypes::ArtistDataType>("DataTypes::ArtistDataType");
     qRegisterMetaType<DataTypes::GenreDataType>("DataTypes::GenreDataType");
     qRegisterMetaType<DataTypes::ColumnsRoles>("DataTypes::ColumnsRoles");
     qRegisterMetaType<ModelDataLoader::TrackDataType>("ModelDataLoader::TrackDataType");
     qRegisterMetaType<TracksListener::TrackDataType>("TracksListener::TrackDataType");
     qRegisterMetaType<ViewManager::ViewsType>("ViewManager::ViewsType");
     qRegisterMetaType<ViewManager::SortOrder>("ViewManager::SortOrder");
     qmlRegisterUncreatableType<ElisaConfigurationDialog>(uri, 1, 0, "ElisaConfigurationDialog", QStringLiteral("only one and done in c++"));
 
     qmlRegisterUncreatableType<ElisaApplication>(uri, 1, 0, "ElisaApplication", QStringLiteral("only one and done in c++"));
     qmlRegisterUncreatableMetaObject(ElisaUtils::staticMetaObject, uri, 1, 0, "ElisaUtils", QStringLiteral("Namespace ElisaUtils"));
 }
diff --git a/src/models/singlealbumproxymodel.cpp b/src/models/singlealbumproxymodel.cpp
deleted file mode 100644
index 5ac67460..00000000
--- a/src/models/singlealbumproxymodel.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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 "singlealbumproxymodel.h"
-
-#include "datatypes.h"
-
-#include <QReadLocker>
-#include <QtConcurrent>
-
-SingleAlbumProxyModel::SingleAlbumProxyModel(QObject *parent) : AbstractMediaProxyModel(parent)
-{
-}
-
-SingleAlbumProxyModel::~SingleAlbumProxyModel() = default;
-
-bool SingleAlbumProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
-{
-    bool result = false;
-
-    auto currentIndex = sourceModel()->index(source_row, 0, source_parent);
-
-    const auto &titleValue = sourceModel()->data(currentIndex, DataTypes::ColumnsRoles::TitleRole).toString();
-    const auto maximumRatingValue = sourceModel()->data(currentIndex, DataTypes::ColumnsRoles::RatingRole).toInt();
-
-    if (maximumRatingValue < mFilterRating) {
-        return result;
-    }
-
-    if (mFilterExpression.match(titleValue).hasMatch()) {
-        result = true;
-    }
-
-    return result;
-}
-
-void SingleAlbumProxyModel::genericEnqueueToPlayList(ElisaUtils::PlayListEnqueueMode enqueueMode, ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay)
-{
-    QtConcurrent::run(&mThreadPool, [=] () {
-        QReadLocker locker(&mDataLock);
-        auto allTracks = ElisaUtils::EntryDataList{};
-        allTracks.reserve(rowCount());
-        for (int rowIndex = 0, maxRowCount = rowCount(); rowIndex < maxRowCount; ++rowIndex) {
-            auto currentIndex = index(rowIndex, 0);
-            allTracks.push_back(ElisaUtils::EntryData{data(currentIndex, DataTypes::FullDataRole).value<DataTypes::TrackDataType>(),
-                                                      data(currentIndex, DataTypes::ColumnsRoles::TitleRole).toString(), {}});
-        }
-        Q_EMIT entriesToEnqueue(allTracks, ElisaUtils::Track, enqueueMode, triggerPlay);
-    });
-}
-
-void SingleAlbumProxyModel::enqueueToPlayList()
-{
-    genericEnqueueToPlayList(ElisaUtils::AppendPlayList, ElisaUtils::DoNotTriggerPlay);
-}
-
-void SingleAlbumProxyModel::replaceAndPlayOfPlayList()
-{
-    genericEnqueueToPlayList(ElisaUtils::ReplacePlayList, ElisaUtils::TriggerPlay);
-}
-
-#include "moc_singlealbumproxymodel.cpp"
diff --git a/src/models/singlealbumproxymodel.h b/src/models/singlealbumproxymodel.h
deleted file mode 100644
index bc58c23d..00000000
--- a/src/models/singlealbumproxymodel.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017 Alexander Stippich <a.stippich@gmx.net>
- * Copyright 2018 Matthieu Gallien <matthieu_gallien@yahoo.fr>
- *
- * 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/>.
- */
-
-#ifndef SINGLEALBUMPROXYMODEL_H
-#define SINGLEALBUMPROXYMODEL_H
-
-#include "elisaLib_export.h"
-
-#include "abstractmediaproxymodel.h"
-#include "elisautils.h"
-
-class ELISALIB_EXPORT SingleAlbumProxyModel : public AbstractMediaProxyModel
-{
-    Q_OBJECT
-
-public:
-
-    explicit SingleAlbumProxyModel(QObject *parent = nullptr);
-
-    ~SingleAlbumProxyModel() override;
-
-Q_SIGNALS:
-
-public Q_SLOTS:
-
-    void enqueueToPlayList();
-
-    void replaceAndPlayOfPlayList();
-
-protected:
-
-    bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
-
-private:
-
-    void genericEnqueueToPlayList(ElisaUtils::PlayListEnqueueMode enqueueMode,
-                                  ElisaUtils::PlayListEnqueueTriggerPlay triggerPlay);
-
-};
-
-#endif // SINGLEALBUMPROXYMODEL_H