diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 39d64a40..bb4d4aa8 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -74,6 +74,7 @@
                         return ["mediaitem-brick"]
                         break;
                     case "music-videos":
+                    case "uploadedVideo":
                     case "uploaded-videos":
                         return "mediaitem-video";
                         break;
diff --git a/src/renderer/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs
index 70d46907..0da3265d 100644
--- a/src/renderer/views/pages/collection-list.ejs
+++ b/src/renderer/views/pages/collection-list.ejs
@@ -1,6 +1,7 @@
 <script type="text/x-template" id="cider-collection-list">
     <div class="content-inner collection-page">
         <h3 class="header-text" v-observe-visibility="{callback: headerVisibility}">{{ title }}</h3>
+        {{ commonKind }}
         <div v-if="data['data'] != 'null'" class="well">
             <template v-for="(item, key) in data.data">
                 <template v-if="item.type == 'artists'">
@@ -8,10 +9,10 @@
                 </template>
                 <template v-else>
                     <mediaitem-list-item
-                            v-if="item.attributes.playParams.kind == 'song'"
+                            v-if="getKind(item) == 'song'"
                             :index="key"
                             :item="item"></mediaitem-list-item>
-                    <mediaitem-square v-else :item="item" :type="item.attributes.playParams.kind"></mediaitem-square>
+                    <mediaitem-square v-else :item="item" :type="getKind(item)"></mediaitem-square>
                 </template>
             </template>
             <button v-if="triggerEnabled" style="opacity:0;height: 32px;" v-observe-visibility="{callback: visibilityChanged}">Show More</button>
@@ -45,10 +46,22 @@
             return {
                 triggerEnabled: true,
                 canSeeTrigger: false,
-                showFab: false
+                showFab: false,
+                commonKind: "song"
             }
         },
         methods: {
+            getKind(item) {
+                if(typeof item.kind != "undefined") {
+                    this.commonKind = item.kind;
+                    return item.kind
+                }
+                if(typeof item.attributes.playParams != "undefined") {
+                    this.commonKind = item.attributes.playParams.kind
+                    return item.attributes.playParams.kind
+                }
+                return this.commonKind
+            },
             scrollToTop() {
                 let target = document.querySelector(".header-text")
                 target.scrollIntoView({behavior: "smooth", block: "start", inline: "nearest"})