diff --git a/src/qml/ContentView.qml b/src/qml/ContentView.qml
index b0461c0c..fca5966b 100644
--- a/src/qml/ContentView.qml
+++ b/src/qml/ContentView.qml
@@ -1,756 +1,771 @@
 /*
  * Copyright 2016-2018 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.
  */
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
 import org.kde.elisa 1.0
 
 RowLayout {
     id: contentViewContainer
     spacing: 0
 
     signal toggleSearch()
 
     function goBack() {
         viewManager.goBack()
     }
 
     ViewManager {
         id: viewManager
 
         onSwitchAllAlbumsView: {
+            elisa.allAlbumsProxyModel.genreFilterText = ''
             listViews.currentIndex = 1
             localArtistsLoader.opacity = 0
             localTracksLoader.opacity = 0
             localAlbumsLoader.opacity = 1
             localGenresLoader.opacity = 0
         }
 
         onSwitchOneAlbumView: {
             elisa.singleAlbumProxyModel.loadAlbumData(databaseId)
             currentStackView.push(albumView, {
                                       mainTitle: mainTitle,
                                       secondaryTitle: secondaryTitle,
                                       image: imageUrl,
                                       stackView: currentStackView,
                                   })
             oneAlbumViewIsLoaded()
         }
 
         onSwitchAllArtistsView: {
             elisa.allArtistsProxyModel.genreFilterText = ''
             listViews.currentIndex = 2
             localArtistsLoader.opacity = 1
             localTracksLoader.opacity = 0
             localAlbumsLoader.opacity = 0
             localGenresLoader.opacity = 0
         }
 
         onSwitchOneArtistView: {
             elisa.singleArtistProxyModel.setArtistFilterText(mainTitle)
+            elisa.singleArtistProxyModel.genreFilterText = ''
+            currentStackView.push(innerAlbumView, {
+                                      mainTitle: mainTitle,
+                                      secondaryTitle: secondaryTitle,
+                                      image: imageUrl,
+                                      stackView: currentStackView,
+                                  })
+            oneArtistViewIsLoaded()
+        }
+
+        onSwitchOneArtistFromGenreView: {
+            elisa.singleArtistProxyModel.setArtistFilterText(mainTitle)
+            elisa.singleArtistProxyModel.genreFilterText = genreName
             currentStackView.push(innerAlbumView, {
                                       mainTitle: mainTitle,
                                       secondaryTitle: secondaryTitle,
                                       image: imageUrl,
                                       stackView: currentStackView,
                                   })
             oneArtistViewIsLoaded()
         }
 
         onSwitchAllTracksView: {
+            elisa.allTracksProxyModel.genreFilterText = ''
             listViews.currentIndex = 3
             localArtistsLoader.opacity = 0
             localTracksLoader.opacity = 1
             localAlbumsLoader.opacity = 0
             localGenresLoader.opacity = 0
         }
 
         onSwitchAllGenresView: {
             listViews.currentIndex = 4
             localArtistsLoader.opacity = 0
             localTracksLoader.opacity = 0
             localAlbumsLoader.opacity = 0
             localGenresLoader.opacity = 1
         }
 
         onSwitchAllArtistsFromGenreView: {
             elisa.allArtistsProxyModel.genreFilterText = genreName
             currentStackView.push(innerArtistView, {
                                       contentModel: elisa.allArtistsProxyModel,
                                       mainTitle: genreName,
                                       secondaryTitle: '',
                                       image: elisaTheme.artistIcon,
                                       stackView: currentStackView,
                                   })
             allArtistsFromGenreViewIsLoaded()
         }
 
         onSwitchOffAllViews: {
             localArtistsLoader.opacity = 0
             localTracksLoader.opacity = 0
             localAlbumsLoader.opacity = 0
             localGenresLoader.opacity = 0
         }
     }
 
     ViewSelector {
         id: listViews
 
         Layout.fillHeight: true
         Layout.preferredWidth: mainWindow.width * 0.11
         Layout.maximumWidth: mainWindow.width * 0.11
 
         onSwitchView: if (index === 1) {
                           viewManager.openAllAlbums()
                       } else if (index === 2) {
                           viewManager.openAllArtists()
                       } else if (index === 3) {
                           viewManager.openAllTracks()
                       } else if (index === 4) {
                           viewManager.openAllGenres()
                       } else {
                           viewManager.closeAllViews()
                       }
     }
 
     Rectangle {
         id: viewSelectorSeparatorItem
 
         border.width: 1
         border.color: myPalette.mid
         color: myPalette.mid
         visible: true
 
         Layout.bottomMargin: elisaTheme.layoutVerticalMargin
         Layout.topMargin: elisaTheme.layoutVerticalMargin
 
         Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
         Layout.fillHeight: true
 
         Layout.preferredWidth: 1
         Layout.minimumWidth: 1
         Layout.maximumWidth: 1
     }
 
     ColumnLayout {
         Layout.fillHeight: true
         Layout.fillWidth: true
 
         spacing: 0
 
         TopNotification {
             id: invalidBalooConfiguration
 
             Layout.fillWidth: true
 
             musicManager: elisa.musicManager
 
             focus: true
         }
 
         Item {
             Layout.fillHeight: true
             Layout.fillWidth: true
 
             RowLayout {
                 anchors.fill: parent
 
                 spacing: 0
 
                 id: contentZone
 
                 FocusScope {
                     id: mainContentView
 
                     focus: true
 
                     Layout.fillHeight: true
 
                     Layout.minimumWidth: 0
                     Layout.maximumWidth: 0
                     Layout.preferredWidth: 0
 
 
                     visible: Layout.minimumWidth != 0
 
                     Rectangle {
                         border {
                             color: (mainContentView.activeFocus ? myPalette.highlight : myPalette.base)
                             width: 1
                         }
 
                         radius: 3
                         color: myPalette.base
 
                         anchors.fill: parent
 
                         Loader {
                             anchors.fill: parent
 
                             anchors.leftMargin: parent.width / 3
                             anchors.rightMargin: parent.width / 3
                             anchors.topMargin: parent.height / 3
                             anchors.bottomMargin: parent.height / 3
 
                             z: 2
 
                             sourceComponent: BusyIndicator {
                                 id: busyScanningMusic
                                 hoverEnabled: false
 
                                 anchors.fill: parent
 
                                 opacity: 0.8
 
                                 visible: true
                                 running: true
 
                                 z: 2
                             }
 
                             active: elisa.musicManager.indexerBusy
                         }
 
                         Loader {
                             id: localAlbumsLoader
 
                             active: opacity > 0
 
                             visible: opacity > 0
 
                             anchors.fill: parent
 
                             onLoaded: viewManager.allAlbumsViewIsLoaded(item.stackView)
 
                             sourceComponent: MediaBrowser {
                                 id: localAlbums
 
                                 focus: true
 
                                 anchors {
                                     fill: parent
 
                                     leftMargin: elisaTheme.layoutHorizontalMargin
                                     rightMargin: elisaTheme.layoutHorizontalMargin
                                 }
 
                                 firstPage: GridBrowserView {
                                     id: allAlbumsView
 
                                     focus: true
 
                                     contentModel: elisa.allAlbumsProxyModel
 
                                     image: elisaTheme.albumIcon
                                     mainTitle: i18nc("Title of the view of all albums", "Albums")
 
                                     onOpen: {
                                         viewManager.openOneAlbum(localAlbums.stackView, innerMainTitle, innerSecondaryTitle, innerImage, databaseId)
                                     }
 
                                     onGoBack: viewManager.goBack()
 
                                     Binding {
                                         target: allAlbumsView
                                         property: 'expandedFilterView'
                                         value: persistentSettings.expandedFilterView
                                     }
 
                                     onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
                                 }
                             }
 
                             Behavior on opacity {
                                 NumberAnimation {
                                     easing.type: Easing.InOutQuad
                                     duration: 300
                                 }
                             }
                         }
 
                         Loader {
                             id: localArtistsLoader
 
                             active: opacity > 0
 
                             visible: opacity > 0
 
                             opacity: 0
 
                             anchors.fill: parent
 
                             onLoaded: viewManager.allArtistsViewIsLoaded(item.stackView)
 
                             sourceComponent: MediaBrowser {
                                 id: localArtists
 
                                 focus: true
 
                                 anchors {
                                     fill: parent
 
                                     leftMargin: elisaTheme.layoutHorizontalMargin
                                     rightMargin: elisaTheme.layoutHorizontalMargin
                                 }
 
                                 firstPage: GridBrowserView {
                                     id: allArtistsView
                                     focus: true
 
                                     showRating: false
                                     delegateDisplaySecondaryText: false
 
                                     contentModel: elisa.allArtistsProxyModel
 
                                     image: elisaTheme.artistIcon
                                     mainTitle: i18nc("Title of the view of all artists", "Artists")
 
                                     onOpen: {
                                         viewManager.openOneArtist(localArtists.stackView, innerMainTitle, innerImage, 0)
                                     }
 
                                     onGoBack: viewManager.goBack()
 
                                     Binding {
                                         target: allArtistsView
                                         property: 'expandedFilterView'
                                         value: persistentSettings.expandedFilterView
                                     }
 
                                     onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
                                 }
                             }
 
                             Behavior on opacity {
                                 NumberAnimation {
                                     easing.type: Easing.InOutQuad
                                     duration: 300
                                 }
                             }
                         }
 
                         Loader {
                             id: localTracksLoader
 
                             active: opacity > 0
 
                             visible: opacity > 0
 
                             opacity: 0
 
                             anchors.fill: parent
 
                             onLoaded: viewManager.allTracksViewIsLoaded(item)
 
                             sourceComponent: MediaBrowser {
                                 id: localTracks
 
                                 focus: true
 
                                 anchors {
                                     fill: parent
 
                                     leftMargin: elisaTheme.layoutHorizontalMargin
                                     rightMargin: elisaTheme.layoutHorizontalMargin
                                 }
 
                                 firstPage: ListBrowserView {
                                     id: allTracksView
                                     focus: true
 
                                     contentModel: elisa.allTracksProxyModel
 
                                     delegate: MediaTrackDelegate {
                                         id: entry
 
                                         width: allTracksView.delegateWidth
                                         height: elisaTheme.trackDelegateHeight
 
                                         focus: true
 
                                         trackData: model.containerData
 
                                         isFirstTrackOfDisc: false
 
                                         isSingleDiscAlbum: model.isSingleDiscAlbum
 
                                         onEnqueue: elisa.mediaPlayList.enqueue(data)
 
                                         onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
 
                                         onClicked: contentDirectoryView.currentIndex = index
                                     }
 
                                     image: elisaTheme.tracksIcon
                                     mainTitle: i18nc("Title of the view of all tracks", "Tracks")
 
                                     Binding {
                                         target: allTracksView
                                         property: 'expandedFilterView'
                                         value: persistentSettings.expandedFilterView
                                     }
 
                                     onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
                                 }
                             }
 
                             Behavior on opacity {
                                 NumberAnimation {
                                     easing.type: Easing.InOutQuad
                                     duration: 300
                                 }
                             }
                         }
 
                         Loader {
                             id: localGenresLoader
 
                             active: opacity > 0
 
                             visible: opacity > 0
 
                             opacity: 0
 
                             anchors.fill: parent
 
                             onLoaded: viewManager.allGenresViewIsLoaded(item.stackView)
 
                             sourceComponent: MediaBrowser {
                                 id: localGenres
 
                                 focus: true
 
                                 anchors {
                                     fill: parent
 
                                     leftMargin: elisaTheme.layoutHorizontalMargin
                                     rightMargin: elisaTheme.layoutHorizontalMargin
                                 }
 
                                 firstPage: GridBrowserView {
                                     id: allGenresView
                                     focus: true
 
                                     showRating: false
                                     delegateDisplaySecondaryText: false
 
                                     contentModel: elisa.allGenresProxyModel
 
                                     image: elisaTheme.genresIcon
                                     mainTitle: i18nc("Title of the view of all genres", "Genres")
 
                                     onOpen: {
                                         viewManager.openAllArtistsFromGenre(localGenres.stackView, innerMainTitle)
                                     }
 
                                     onGoBack: viewManager.goBack()
 
                                     Binding {
                                         target: allGenresView
                                         property: 'expandedFilterView'
                                         value: persistentSettings.expandedFilterView
                                     }
 
                                     onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
                                 }
                             }
 
                             Behavior on opacity {
                                 NumberAnimation {
                                     easing.type: Easing.InOutQuad
                                     duration: 300
                                 }
                             }
                         }
 
                         Behavior on border.color {
                             ColorAnimation {
                                 duration: 300
                             }
                         }
                     }
                 }
 
                 Rectangle {
                     id: firstViewSeparatorItem
 
                     border.width: 1
                     border.color: myPalette.mid
                     color: myPalette.mid
                     visible: true
 
                     Layout.bottomMargin: elisaTheme.layoutVerticalMargin
                     Layout.topMargin: elisaTheme.layoutVerticalMargin
 
                     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                     Layout.fillHeight: true
 
                     Layout.preferredWidth: 1
                     Layout.minimumWidth: 1
                     Layout.maximumWidth: 1
                 }
 
                 MediaPlayListView {
                     id: playList
 
                     playListModel: elisa.mediaPlayList
 
                     Layout.fillHeight: true
                     Layout.leftMargin: elisaTheme.layoutHorizontalMargin
                     Layout.rightMargin: elisaTheme.layoutHorizontalMargin
 
                     Layout.minimumWidth: contentZone.width
                     Layout.maximumWidth: contentZone.width
                     Layout.preferredWidth: contentZone.width
 
                     onStartPlayback: elisa.audioControl.ensurePlay()
 
                     onPausePlayback: elisa.audioControl.playPause()
 
                     onDisplayError: messageNotification.showNotification(errorText)
                 }
 
                 Rectangle {
                     id: viewSeparatorItem
 
                     border.width: 1
                     border.color: myPalette.mid
                     color: myPalette.mid
                     visible: Layout.minimumWidth != 0
 
                     Layout.bottomMargin: elisaTheme.layoutVerticalMargin
                     Layout.topMargin: elisaTheme.layoutVerticalMargin
 
                     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
                     Layout.fillHeight: true
 
                     Layout.preferredWidth: 1
                     Layout.minimumWidth: 1
                     Layout.maximumWidth: 1
                 }
 
                 ContextView {
                     id: albumContext
 
                     Layout.fillHeight: true
 
                     Layout.minimumWidth: contentZone.width
                     Layout.maximumWidth: contentZone.width
                     Layout.preferredWidth: contentZone.width
 
                     visible: Layout.minimumWidth != 0
 
                     artistName: elisa.manageHeaderBar.artist
                     albumName: elisa.manageHeaderBar.album
                     albumArtUrl: elisa.manageHeaderBar.image
                 }
             }
         }
 
         states: [
             State {
                 name: 'playList'
                 when: listViews.currentIndex === 0
                 PropertyChanges {
                     target: mainContentView
                     Layout.fillWidth: false
                     Layout.minimumWidth: 0
                     Layout.maximumWidth: 0
                     Layout.preferredWidth: 0
                 }
                 PropertyChanges {
                     target: firstViewSeparatorItem
                     Layout.minimumWidth: 0
                     Layout.maximumWidth: 0
                     Layout.preferredWidth: 0
                 }
                 PropertyChanges {
                     target: playList
                     Layout.minimumWidth: contentZone.width / 2
                     Layout.maximumWidth: contentZone.width / 2
                     Layout.preferredWidth: contentZone.width / 2
                 }
                 PropertyChanges {
                     target: viewSeparatorItem
                     Layout.minimumWidth: 1
                     Layout.maximumWidth: 1
                     Layout.preferredWidth: 1
                 }
                 PropertyChanges {
                     target: albumContext
                     Layout.minimumWidth: contentZone.width / 2
                     Layout.maximumWidth: contentZone.width / 2
                     Layout.preferredWidth: contentZone.width / 2
                 }
             },
             State {
                 name: 'browsingViews'
                 when: listViews.currentIndex !== 0
                 PropertyChanges {
                     target: mainContentView
                     Layout.fillWidth: true
                     Layout.minimumWidth: contentZone.width * 0.66
                     Layout.maximumWidth: contentZone.width * 0.68
                     Layout.preferredWidth: contentZone.width * 0.68
                 }
                 PropertyChanges {
                     target: firstViewSeparatorItem
                     Layout.minimumWidth: 1
                     Layout.maximumWidth: 1
                     Layout.preferredWidth: 1
                 }
                 PropertyChanges {
                     target: playList
                     Layout.minimumWidth: contentZone.width * 0.33
                     Layout.maximumWidth: contentZone.width * 0.33
                     Layout.preferredWidth: contentZone.width * 0.33
                 }
                 PropertyChanges {
                     target: viewSeparatorItem
                     Layout.minimumWidth: 0
                     Layout.maximumWidth: 0
                     Layout.preferredWidth: 0
                 }
                 PropertyChanges {
                     target: albumContext
                     Layout.minimumWidth: 0
                     Layout.maximumWidth: 0
                     Layout.preferredWidth: 0
                 }
             }
         ]
         transitions: Transition {
             NumberAnimation {
                 properties: "Layout.minimumWidth, Layout.maximumWidth, Layout.preferredWidth, opacity"
                 easing.type: Easing.InOutQuad
                 duration: 300
             }
         }
     }
 
     Component {
         id: innerAlbumView
 
         GridBrowserView {
             id: innerAlbumGridView
 
             contentModel: elisa.singleArtistProxyModel
 
             isSubPage: true
 
             onOpen: {
                 viewManager.openOneAlbum(stackView, innerMainTitle, innerSecondaryTitle, innerImage, databaseId)
             }
 
             onGoBack: viewManager.goBack()
 
             Binding {
                 target: innerAlbumGridView
                 property: 'expandedFilterView'
                 value: persistentSettings.expandedFilterView
             }
 
             onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
         }
     }
 
     Component {
         id: innerArtistView
 
         GridBrowserView {
             id: innerAlbumGridView
 
             delegateDisplaySecondaryText: false
 
             isSubPage: true
 
             onOpen: {
-                viewManager.openOneArtist(stackView, innerMainTitle, innerImage, databaseId)
+                viewManager.openOneArtist(stackView, innerMainTitle, innerImage, 0)
             }
 
             onGoBack: viewManager.goBack()
 
             Binding {
                 target: innerAlbumGridView
                 property: 'expandedFilterView'
                 value: persistentSettings.expandedFilterView
             }
 
             onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
         }
     }
 
     Component {
         id: albumView
 
         ListBrowserView {
             id: albumGridView
 
             contentModel: elisa.singleAlbumProxyModel
 
             isSubPage: true
 
             delegate: MediaAlbumTrackDelegate {
                 id: entry
 
                 width: albumGridView.delegateWidth
                 height: ((model.isFirstTrackOfDisc && !isSingleDiscAlbum) ? elisaTheme.delegateHeight*2 : elisaTheme.delegateHeight)
 
                 focus: true
 
                 mediaTrack.trackData: model.containerData
 
                 mediaTrack.isFirstTrackOfDisc: model.isFirstTrackOfDisc
 
                 mediaTrack.isSingleDiscAlbum: model.isSingleDiscAlbum
 
                 mediaTrack.onEnqueue: elisa.mediaPlayList.enqueue(data)
 
                 mediaTrack.onReplaceAndPlay: elisa.mediaPlayList.replaceAndPlay(data)
 
                 mediaTrack.isAlternateColor: (index % 2) === 1
 
                 mediaTrack.onClicked: contentDirectoryView.currentIndex = index
             }
 
             allowArtistNavigation: true
 
             onShowArtist: {
                 viewManager.openOneArtist(stackView, name, elisaTheme.artistIcon, 0)
             }
 
             onGoBack: viewManager.goBack()
 
             expandedFilterView: true
 
             Binding {
                 target: albumGridView
                 property: 'expandedFilterView'
                 value: persistentSettings.expandedFilterView
             }
 
             onFilterViewChanged: persistentSettings.expandedFilterView = expandedFilterView
         }
     }
 }
diff --git a/src/qml/ViewManager.qml b/src/qml/ViewManager.qml
index e76839f9..2a2e4e58 100644
--- a/src/qml/ViewManager.qml
+++ b/src/qml/ViewManager.qml
@@ -1,247 +1,249 @@
 /*
  * 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.
  */
 
 import QtQuick 2.7
 
 QtObject {
 
     enum ViewsType {
         NoViews,
         AllAlbums,
         OneAlbum,
         AllArtists,
         OneArtist,
         OneAlbumFromArtist,
         AllTracks,
         AllGenres,
         AllArtistsFromGenre,
         OneArtistFromGenre,
         OneAlbumFromArtistAndGenre
     }
 
     property int currentView: ViewManager.ViewsType.NoViews
     property string currentAlbumTitle
     property string currentAlbumAuthor
     property string currentArtistName
     property string currentGenreName
     property var currentStackView
 
     property int targetView: ViewManager.ViewsType.NoViews
     property string targetAlbumTitle
     property string targetAlbumAuthor
     property string targetArtistName
     property string targetGenreName
     property url targetImageUrl
     property int targetDatabaseId
 
     signal switchAllAlbumsView()
     signal switchOneAlbumView(var currentStackView, string mainTitle, url imageUrl, string secondaryTitle, int databaseId)
     signal switchAllArtistsView()
     signal switchOneArtistView(var currentStackView, string mainTitle, url imageUrl, string secondaryTitle, int databaseId)
     signal switchAllTracksView()
     signal switchAllGenresView()
     signal switchAllArtistsFromGenreView(var currentStackView, string genreName)
+    signal switchOneArtistFromGenreView(var currentStackView, string mainTitle, url imageUrl, string secondaryTitle, int databaseId, string genreName)
     signal switchOffAllViews()
 
     function closeAllViews()
     {
         currentView = ViewManager.ViewsType.NoViews
         targetView = ViewManager.ViewsType.NoViews
         switchOffAllViews()
     }
 
     function openAllAlbums()
     {
         targetView = ViewManager.ViewsType.AllAlbums
 
         if (currentView != targetView) {
             switchAllAlbumsView()
         }
     }
 
     function openOneAlbum(stackView, albumTitle, albumAuthor, albumCover, albumDatabaseId)
     {
         targetAlbumTitle = albumTitle
         targetAlbumAuthor = albumAuthor
         targetDatabaseId = albumDatabaseId
         targetImageUrl = albumCover
         currentStackView = stackView
 
         if (currentView == ViewManager.ViewsType.AllAlbums) {
             targetView = ViewManager.ViewsType.OneAlbum
             switchOneAlbumView(currentStackView, targetAlbumTitle, targetImageUrl, targetAlbumAuthor, targetDatabaseId)
         } else if (currentView == ViewManager.ViewsType.OneArtist) {
             targetView = ViewManager.ViewsType.OneAlbumFromArtist
             switchOneAlbumView(currentStackView, targetAlbumTitle, targetImageUrl, targetAlbumAuthor, targetDatabaseId)
         } else if (currentView == ViewManager.ViewsType.OneArtistFromGenre) {
             targetView = ViewManager.ViewsType.OneAlbumFromArtistAndGenre
             switchOneAlbumView(currentStackView, targetAlbumTitle, targetImageUrl, targetAlbumAuthor, targetDatabaseId)
         } else {
             switchAllAlbumsView()
         }
     }
 
     function openAllArtists()
     {
         targetView = ViewManager.ViewsType.AllArtists
 
         if (currentView != targetView) {
             switchAllArtistsView()
         }
     }
 
     function openOneArtist(stackView, artistName, artistImageUrl, artistDatabaseId)
     {
         targetArtistName = artistName
         targetDatabaseId = artistDatabaseId
         targetImageUrl = artistImageUrl
         currentStackView = stackView
 
         if (currentView == ViewManager.ViewsType.AllArtistsFromGenre) {
             targetView = ViewManager.ViewsType.OneArtistFromGenre
         } else {
             targetView = ViewManager.ViewsType.OneArtist
         }
 
         if (currentView == ViewManager.ViewsType.AllArtists && targetView == ViewManager.ViewsType.OneArtist) {
             switchOneArtistView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId)
         } else if (currentView == ViewManager.ViewsType.OneArtist && currentArtistName != targetArtistName &&
                    targetView == ViewManager.ViewsType.OneArtist) {
             currentStackView.pop()
             switchOneArtistView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId)
         } else if (currentView == ViewManager.ViewsType.OneAlbumFromArtist && currentArtistName != targetArtistName &&
                    targetView == ViewManager.ViewsType.OneArtist) {
             currentStackView.pop()
             currentStackView.pop()
             switchOneArtistView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId)
         } else if (currentView == ViewManager.ViewsType.AllArtistsFromGenre && targetView == ViewManager.ViewsType.OneArtistFromGenre) {
-            switchOneArtistView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId)
+            switchOneArtistFromGenreView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId, targetGenreName)
         } else {
             switchAllArtistsView()
         }
     }
 
     function openAllTracks()
     {
         targetView = ViewManager.ViewsType.AllTracks
         if (currentView != targetView) {
             switchAllTracksView()
         }
     }
 
     function openAllGenres()
     {
         targetView = ViewManager.ViewsType.AllGenres
 
         if (currentView != targetView) {
             switchAllGenresView()
         }
     }
 
     function openAllArtistsFromGenre(stackView, genreName)
     {
         targetView = ViewManager.ViewsType.AllArtistsFromGenre
         targetGenreName = genreName
         currentStackView = stackView
 
         if (currentView == ViewManager.ViewsType.AllGenres) {
             switchAllArtistsFromGenreView(currentStackView, targetGenreName)
         } else {
             switchAllGenresView()
         }
     }
 
     function allAlbumsViewIsLoaded(stackView)
     {
         currentStackView = stackView
         currentView = ViewManager.ViewsType.AllAlbums
         if (targetView == ViewManager.ViewsType.OneAlbum) {
             switchOneAlbumView(currentStackView, targetAlbumTitle, targetImageUrl, targetArtistName, targetDatabaseId)
         }
     }
 
     function oneAlbumViewIsLoaded()
     {
         currentAlbumTitle = targetAlbumTitle
         currentAlbumAuthor = targetAlbumAuthor
 
         if (targetView == ViewManager.ViewsType.OneAlbum) {
             currentView = ViewManager.ViewsType.OneAlbum
         } else if (targetView == ViewManager.ViewsType.OneAlbumFromArtist) {
             currentView = ViewManager.ViewsType.OneAlbumFromArtist
         } else if (targetView == ViewManager.ViewsType.OneAlbumFromArtistAndGenre) {
             currentView = ViewManager.ViewsType.OneAlbumFromArtistAndGenre
         }
     }
 
     function allArtistsViewIsLoaded(stackView)
     {
         currentStackView = stackView
         currentView = ViewManager.ViewsType.AllArtists
         if (targetView == ViewManager.ViewsType.OneArtist) {
             switchOneArtistView(currentStackView, targetArtistName, targetImageUrl, '', targetDatabaseId)
         }
     }
 
     function oneArtistViewIsLoaded()
     {
         currentArtistName = targetArtistName
         if (targetView == ViewManager.ViewsType.OneArtist) {
             currentView = ViewManager.ViewsType.OneArtist
         } else {
+            currentGenreName = targetGenreName
             currentView = ViewManager.ViewsType.OneArtistFromGenre
         }
     }
 
     function allTracksViewIsLoaded(allTracksView)
     {
         currentView = ViewManager.ViewsType.AllTracks
     }
 
     function allGenresViewIsLoaded(stackView)
     {
         currentStackView = stackView
         currentView = ViewManager.ViewsType.AllGenres
     }
 
     function allArtistsFromGenreViewIsLoaded()
     {
         currentGenreName = targetGenreName
         currentView = ViewManager.ViewsType.AllArtistsFromGenre
     }
 
     function goBack()
     {
         currentStackView.pop()
 
         if (currentView == ViewManager.ViewsType.OneAlbum) {
             currentView = ViewManager.ViewsType.AllAlbums
         } else if (currentView == ViewManager.ViewsType.OneArtist) {
             currentView = ViewManager.ViewsType.AllArtists
         } else if (currentView == ViewManager.ViewsType.OneAlbumFromArtist) {
             currentView = ViewManager.ViewsType.OneArtist
         } else if (currentView == ViewManager.ViewsType.AllArtistsFromGenre) {
             currentView = ViewManager.ViewsType.AllGenres
         } else if (currentView == ViewManager.ViewsType.OneArtistFromGenre) {
             currentView = ViewManager.ViewsType.AllArtistsFromGenre
         } else if (currentView == ViewManager.ViewsType.OneAlbumFromArtistAndGenre) {
             currentView = ViewManager.ViewsType.OneArtistFromGenre
         }
     }
 }