diff --git a/drama/classes/submission.py b/drama/classes/submission.py
index 900a97705..b2b732fc5 100644
--- a/drama/classes/submission.py
+++ b/drama/classes/submission.py
@@ -205,9 +205,11 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
 	@property
 	#@lazy
 	def thumb_url(self):
-		
+
 		if self.over_18: return f"/assets/images/nsfw.png"
-		return self.thumburl
+		elif self.thumburl: return self.thumburl
+		elif "youtu.be" in self.domain or "youtube.com" in self.domain: return '/assets/images/default_thumb_yt.png'
+		else: return '/assets/images/default_thumb_link.png'
 
 	@property
 
@@ -233,6 +235,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
 				'score': self.score_fuzzed,
 				'upvotes': self.upvotes_fuzzed,
 				'downvotes': self.downvotes_fuzzed,
+				'stickied': self.stickied,
 				#'award_count': self.award_count,
 				'meta_title': self.meta_title,
 				'meta_description': self.meta_description,
diff --git a/drama/templates/submission_listing.html b/drama/templates/submission_listing.html
index 12d6b7fa4..97c00dd28 100644
--- a/drama/templates/submission_listing.html
+++ b/drama/templates/submission_listing.html
@@ -77,16 +77,6 @@
 				<a target="_blank" href="{{p.realurl(v)}}" rel="nofollow noopener" target="_blank">
 					<img src="{{p.thumb_url}}" class="post-img" alt="">
 				</a>
-				
-				{% elif "youtu.be" in p.domain or "youtube.com" in p.domain %}
-				<a target="_blank" href="{{p.realurl(v)}}" target="_blank" rel="nofollow noopener">
-					<img src="{{p.thumb_url if p.thumb_url else '/assets/images/default_thumb_yt.png'}}" class="post-img border-0" alt="generic youtube embed thumbnail">
-				</a>
-				
-				{% else %}
-				<a target="_blank" href="{{p.realurl(v)}}" rel="nofollow noopener" target="_blank">
-					<img src="/assets/images/default_thumb_link.png" class="post-img border-0" alt="generic link post thumbnail">
-				</a>
 				{% endif %}
 			</div>