diff --git a/templates/components/themes/common/content.latte b/templates/components/themes/common/content.latte
index 9ef7827..35a2482 100644
--- a/templates/components/themes/common/content.latte
+++ b/templates/components/themes/common/content.latte
@@ -6,14 +6,14 @@
 <section class="carousel" aria-label="carousel" Tabindex="0">
   <div class="slides">
 		{foreach $item->imagePost->images as $i => $image}
-		<div class="slides-item" id="image-{$i + 1}" tabindex="0">
+		<div class="slides-item" id="{$item->id}-image{$i + 1}" tabindex="0">
 			<img src="{url_stream($image->imageURL->urlList[0])}" />
 		</div>
 		{/foreach}
   </div>
   <div class="carousel__nav">
 		{for $i = 0; $i < count($item->imagePost->images); $i++}
-		<a class="slider-nav" href="#image-{$i + 1}">{$i + 1}</a>
+		<a class="slider-nav" href="#{$item->id}-image{$i + 1}">{$i + 1}</a>
 		{/for}
   </div>
   <div class="carousel__skip-message" id="skip-link" tabindex="0"></div>
diff --git a/templates/components/themes/default.latte b/templates/components/themes/default.latte
index 6eaf388..a4e0390 100644
--- a/templates/components/themes/default.latte
+++ b/templates/components/themes/default.latte
@@ -24,7 +24,7 @@
 			<div class="has-text-centered">
 				{include './common/content.latte', item: $item, isAutoplay: false, isBig: false}
 			</div>
-			{if isset($item->video->playAddr)}
+			{if isset($item->video->playAddr) && $item->video->playAddr !== ""}
 			<!-- Download links, not shown if item is a gallery -->
 			<p class="has-text-centered"><b>Download video</b></p>
 			{include './common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $item->author->uniqueId}
diff --git a/templates/views/video.latte b/templates/views/video.latte
index 8f9b73e..81d14ba 100644
--- a/templates/views/video.latte
+++ b/templates/views/video.latte
@@ -39,7 +39,7 @@
 							{include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount}
 							<div class="has-text-centered">
 								{include '../components/themes/common/share.latte', uniqueId: $info->detail->uniqueId, id: $item->id}
-								{if isset($item->video->playAddr)}
+								{if isset($item->video->playAddr) && $item->video->playAddr !== ""}
 								<!-- Download links, not shown if item is a gallery -->
 								{include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $info->detail->uniqueId}
 								{/if}