diff --git a/lib/Spot.php b/lib/Spot.php
index 86e85d1..b4b8c36 100755
--- a/lib/Spot.php
+++ b/lib/Spot.php
@@ -397,17 +397,13 @@ class Spot extends Main
 
 		$asMedias = $this->oMedia->getMediasInfo($asConstraints);
 		foreach($asMedias as &$asMedia) {
-			$iTimeStampTakenOn = strtotime($asMedia['taken_on']);
-			$iTimeStampPostedOn = strtotime($asMedia['posted_on']);
-			$asMedia['taken_on_formatted'] = $this->getTimeFormat($iTimeStampTakenOn);
-			$asMedia['taken_on_formatted_local'] = $this->getTimeFormat($iTimeStampTakenOn, $asMedia['timezone']);
-			$asMedia['taken_on_formatted_day_offset'] = self::getTimeZoneDayOffset($iTimeStampTakenOn, $asMedia['timezone']);
-			$asMedia['posted_on_formatted'] = $this->getTimeFormat($iTimeStampPostedOn);
-			$asMedia['posted_on_formatted_local'] = $this->getTimeFormat($iTimeStampPostedOn, $asMedia['timezone']);
-			$asMedia['posted_on_formatted_day_offset'] = self::getTimeZoneDayOffset($iTimeStampPostedOn, $asMedia['timezone']);
 			$asMedia['displayed_id'] = $asMedia[Db::getId(Media::MEDIA_TABLE)];
 
 			$this->addTimeStamp($asMedia, strtotime($asMedia[$sTimeRefField]), $asMedia['timezone']);
+			$this->addTimeStamp($asMedia, strtotime($asMedia['taken_on']), $asMedia['timezone'], 'taken_on');
+			$this->addTimeStamp($asMedia, strtotime($asMedia['posted_on']), $asMedia['timezone'], 'posted_on');
+			unset($asMedia['taken_on']);
+			unset($asMedia['posted_on']);
 		}
 
 		return $asMedias;
@@ -439,14 +435,16 @@ class Spot extends Main
 		return $asPosts;
 	}
 
-	private function addTimeStamp(&$asData, $iTime, $sTimeZone='') {
-		$asData['unix_time'] = (int) $iTime;
-		$asData['relative_time'] = Toolbox::getDateTimeDesc($iTime, $this->oLang->getLanguage());
-		$asData['formatted_time'] = $this->getTimeFormat($iTime);
+	private function addTimeStamp(&$asData, $iTime, $sTimeZone='', $sPrefix='') {
+		if($sPrefix != '') $sPrefix = $sPrefix.'_';
+
+		$asData[$sPrefix.'unix_time'] = (int) $iTime;
+		$asData[$sPrefix.'relative_time'] = Toolbox::getDateTimeDesc($iTime, $this->oLang->getLanguage());
+		$asData[$sPrefix.'formatted_time'] = $this->getTimeFormat($iTime);
         
 		if($sTimeZone != '') {
-            $asData['formatted_time_local'] = $this->getTimeFormat($iTime, $sTimeZone);
-			$asData['day_offset'] = self::getTimeZoneDayOffset($iTime, $sTimeZone);
+            $asData[$sPrefix.'formatted_time_local'] = $this->getTimeFormat($iTime, $sTimeZone);
+			$asData[$sPrefix.'day_offset'] = self::getTimeZoneDayOffset($iTime, $sTimeZone);
         }
 	}
 
diff --git a/src/components/projectMediaLink.vue b/src/components/projectMediaLink.vue
index f3b671b..c21ef96 100644
--- a/src/components/projectMediaLink.vue
+++ b/src/components/projectMediaLink.vue
@@ -58,10 +58,10 @@ export default {
 			<spotIcon :icon="'post'" :classes="'fa-lg fa-fw push'" :text-classes="'comment-text'" :text="options.comment" />
 		</span>
 		<span  ref="postedon" class="lb-caption-line">
-			<projectRelTime :icon="'upload'" :localTime="options.posted_on_formatted_local" :siteTime="options.posted_on_formatted" :offset="options.posted_on_formatted_day_offset" />
+			<projectRelTime :icon="'upload'" :localTime="options.posted_on_formatted_time_local" :siteTime="options.posted_on_formatted_time" :offset="options.posted_on_day_offset" />
 		</span>
 		<span ref="takenon" class="lb-caption-line">
-			<projectRelTime :icon="options.subtype+'-shot'" :localTime="options.taken_on_formatted_local" :siteTime="options.taken_on_formatted" :offset="options.taken_on_formatted_day_offset" />
+			<projectRelTime :icon="options.subtype+'-shot'" :localTime="options.taken_on_formatted_time_local" :siteTime="options.taken_on_formatted_time" :offset="options.taken_on_day_offset" />
 		</span>
 	</div>
 </template>
\ No newline at end of file
diff --git a/src/scripts/page.project.js b/src/scripts/page.project.js
index b33cc16..c7428d1 100644
--- a/src/scripts/page.project.js
+++ b/src/scripts/page.project.js
@@ -1083,7 +1083,7 @@ export default class Project {
 	}
 
 	getMediaLink(asData, sType) {
-		var bTimeDiff = (asData.posted_on_formatted && asData.posted_on_formatted_local != asData.posted_on_formatted);
+		var bTimeDiff = (asData.posted_on_formatted_time && asData.posted_on_formatted_time_local != asData.posted_on_formatted_time);
 
 		var $Comment = (!asData.comment || asData.comment == '')?'':
 			$('<span>', {'class': 'lb-caption-line comment desktop', 'title': asData.comment})
@@ -1091,14 +1091,14 @@ export default class Project {
 				.append($('<span>', {'class':'comment-text'}).text(asData.comment));
 
 		var $PostedOn =
-			$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.posted_on_formatted_local):''})
+			$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.posted_on_formatted_time_local):''})
 				.addIcon('fa-upload fa-lg fa-fw', true)
-				.append(asData.posted_on_formatted);
+				.append(asData.posted_on_formatted_time);
 
 		var $TakenOn = (asData.taken_on == asData.posted_on)?'':
-			$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.taken_on_formatted_local):''})
+			$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?this.spot.lang('local_time', asData.taken_on_formatted_time_local):''})
 				.addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true)
-				.append(asData.taken_on_formatted);
+				.append(asData.taken_on_formatted_time);
 
 		var $Title = $('<div>')
 			.append($Comment)