diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js
index 6523c06..a013835 100644
--- a/web/app/pods/components/music-tab/component.js
+++ b/web/app/pods/components/music-tab/component.js
@@ -506,8 +506,8 @@ export default Component.extend(helperMixin, visualizerMixin, {
       // need to manually remove the tooltip
       $('body .tooltip').remove();
 
-      if (index === this.get('playQueuePointer')) {
-        this.send('goToSong', index, true, true);
+      if (this.get('dancer').audio) {
+        this.clearCurrentAudio(true);
       }
     },
     playerAreaPlay() {
diff --git a/web/app/pods/components/music-tab/template.hbs b/web/app/pods/components/music-tab/template.hbs
index 1d310a9..fad5413 100644
--- a/web/app/pods/components/music-tab/template.hbs
+++ b/web/app/pods/components/music-tab/template.hbs
@@ -96,7 +96,7 @@
 
       {{#ember-collection
         items=playQueue
-        cell-layout=(percentage-columns-layout playQueue.length playlistColumns 62) as |item|
+        cell-layout=(percentage-columns-layout playQueue.length playlistColumns 62) as |item index|
       }}
         <div class="playlist-item pointer track{{index}} {{if (eq index playQueuePointer) "active"}} {{if dragging "hidden"}}" {{action "goToSong" index true bubbles=false}}>
         {{#if item.picture}}
@@ -109,11 +109,7 @@
           {{#if item.title}}
             <div class="song-title">{{item.title}}</div>
             <div class="song-artist">
-              {{#if item.artistUrl}}
-                <a href="#" {{action "gotoURL" item.artistUrl bubbles=false}}>{{item.artist}}</a>
-              {{else}}
-                {{item.artist}}
-              {{/if}}
+              {{item.artist}}
             </div>
           {{else}}
             {{item.fileName}}
diff --git a/web/package.json b/web/package.json
index 512f7e6..3a8dff5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,7 +37,7 @@
     "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
-    "ember-collection": "^1.0.0-alpha.7",
+    "ember-collection": "https://github.com/emberjs/ember-collection",
     "ember-export-application-global": "^2.0.0",
     "ember-inline-svg": "^0.1.7",
     "ember-load-initializers": "^1.0.0",
diff --git a/web/yarn.lock b/web/yarn.lock
index 9596554..1046b84 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -2662,9 +2662,9 @@ ember-cli@^2.14.0:
     walk-sync "^0.3.0"
     yam "0.0.22"
 
-ember-collection@^1.0.0-alpha.7:
+"ember-collection@https://github.com/emberjs/ember-collection":
   version "1.0.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/ember-collection/-/ember-collection-1.0.0-alpha.7.tgz#172c2ddaa7d3482fac0781686b434c9c9c42d79a"
+  resolved "https://github.com/emberjs/ember-collection#d2a3565cb7ee32fd09092496ad76b7302c547063"
   dependencies:
     ember-cli-babel "^5.1.5"
     ember-cli-htmlbars "^1.0.1"