diff --git a/index.php b/index.php
index d67d1e8..423e91d 100644
--- a/index.php
+++ b/index.php
@@ -30,12 +30,15 @@ function video_metadata($path){
         $lower = [];
         foreach ($tags as $k => $v) $lower[strtolower($k)] = $v;
         if (!empty($lower['title'])) $meta['title'] = $lower['title'];
-        if (!empty($lower['date'])) $meta['date'] = $lower['date'];
-        if (!empty($lower['creation_time'])) $meta['date'] = substr($lower['creation_time'], 0, 10);
-        foreach (['location','place','location-eng','com.apple.quicktime.location.iso6709'] as $k) {
+        if (!empty($lower['date'])) {
+            $meta['date'] = $lower['date'];
+        } elseif (!empty($lower['creation_time'])) {
+            $meta['date'] = substr($lower['creation_time'], 0, 10);
+        }
+        foreach (['location','place','location-eng','com.apple.quicktime.location.name','com.apple.quicktime.location.iso6709'] as $k) {
             if (!empty($lower[$k])) { $meta['location'] = $lower[$k]; break; }
         }
-        foreach (['description','comment','synopsis'] as $k) {
+        foreach (['description','synopsis'] as $k) {
             if (!empty($lower[$k])) { $meta['description'] = $lower[$k]; break; }
         }
     }