Also adding same functionality when viewing from the artist page
Merge branch 'feature-better-request' into develop