diff --git a/lib/Db/TimelineQueryDay.php b/lib/Db/TimelineQueryDay.php
index 6efed3ce..7cf00a99 100644
--- a/lib/Db/TimelineQueryDay.php
+++ b/lib/Db/TimelineQueryDay.php
@@ -25,7 +25,7 @@ trait TimelineQueryDay {
             }
 
             if ($row["category"] === ITags::TAG_FAVORITE) {
-                $row["favorite"] = 1;
+                $row["isfavorite"] = 1;
             }
             unset($row["category"]);
         }
diff --git a/src/components/Photo.vue b/src/components/Photo.vue
index 6781d469..fa982beb 100644
--- a/src/components/Photo.vue
+++ b/src/components/Photo.vue
@@ -13,7 +13,7 @@
              v-if="!(data.flag & c.FLAG_PLACEHOLDER)"
              @click="toggleSelect"></div>
 
-        <div v-if="data.isvideo" class="icon-video-white"></div>
+        <div v-if="data.flag & c.FLAG_IS_VIDEO" class="icon-video-white"></div>
         <div v-if="data.flag & c.FLAG_IS_FAVORITE" class="icon-starred"></div>
 
         <div class="img-outer" :style="{
diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue
index bf9556c9..1bd0d406 100644
--- a/src/components/Timeline.vue
+++ b/src/components/Timeline.vue
@@ -615,7 +615,11 @@ export default {
                 }
 
                 // Flag conversion
-                if (photo.favorite) {
+                if (photo.isvideo) {
+                    photo.flag |= constants.FLAG_IS_VIDEO;
+                    delete photo.isvideo;
+                }
+                if (photo.isfavorite) {
                     photo.flag |= constants.FLAG_IS_FAVORITE;
                     delete photo.favorite;
                 }
diff --git a/src/mixins/constants.js b/src/mixins/constants.js
index 7e3d0f9d..a8de8356 100644
--- a/src/mixins/constants.js
+++ b/src/mixins/constants.js
@@ -2,9 +2,10 @@ export default {
     FLAG_PLACEHOLDER:   1 << 0,
     FLAG_LOADED:        1 << 1,
     FLAG_LOAD_FAIL:     1 << 2,
-    FLAG_SELECTED:      1 << 3,
-    FLAG_LEAVING:       1 << 4,
-    FLAG_EXIT_LEFT:     1 << 5,
-    FLAG_ENTER_RIGHT:   1 << 6,
-    FLAG_IS_FAVORITE:   1 << 7,
+    FLAG_IS_VIDEO:      1 << 3,
+    FLAG_IS_FAVORITE:   1 << 4,
+    FLAG_SELECTED:      1 << 5,
+    FLAG_LEAVING:       1 << 6,
+    FLAG_EXIT_LEFT:     1 << 7,
+    FLAG_ENTER_RIGHT:   1 << 8,
 };
\ No newline at end of file