diff --git a/src/Model/Entity/Claim.php b/src/Model/Entity/Claim.php
index 8faa889..e2d3cb7 100644
--- a/src/Model/Entity/Claim.php
+++ b/src/Model/Entity/Claim.php
@@ -5,7 +5,14 @@ namespace App\Model\Entity;
 use Cake\ORM\Entity;
 
 class Claim extends Entity {
-
+    function getLbryLink() {
+        $link = $this->Name;
+        if (isset($this->Publisher->Name)) {
+            $link = $this->Publisher->Name . '/' . $link;
+        }
+        $link = 'lbry://' . $link;
+        return $link;
+    }
 }
 
 ?>
\ No newline at end of file
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index f2ec67a..0507716 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -40,14 +40,6 @@
 
 $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow'];
 $autoThumbText = '';
-$link = $claim->Name;
-$rawLink = $claim->Name;
-if (isset($claim->Publisher->Name)) {
-    $link = urlencode($claim->Publisher->Name) . '/' . $link;
-    $rawLink = $claim->Publisher->Name . '/' . $rawLink;
-}
-$link = 'lbry://' . $link;
-$rawLink = 'lbry://' . $rawLink;
 if ($claim->ClaimType == 1) { $autoThumbText = strtoupper(substr($claim->Name, 1, min( strlen($claim->Name), 10 ))); } else {
     $str = str_replace(' ', '', (strlen(trim($claim->Title)) > 0) ? $claim->Title : $claim->Name);
     $autoThumbText = strtoupper(mb_substr($str, 0, min( strlen($str), 10 )));
@@ -81,7 +73,7 @@ if (strlen(trim($desc)) == 0) {
     <div class="claim-info">
         <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
             <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                <img src="<?php echo $claim->ThumbnailUrl ?>" alt="" />
+                <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
             <?php else: ?>
                 <div class="autothumb"><?php echo $autoThumbText ?></div>
             <?php endif; ?>
@@ -144,7 +136,7 @@ if (strlen(trim($desc)) == 0) {
                 <div class="value half-width"><?php echo strlen(trim($claim->Language)) > 0 ? ($claim->Language == 'en' ? 'English' : '') : '<em>Unspecified</em>' ?></div>
             </div>
         <?php endif; ?>
-        <a href="<?php echo $link ?>" class="open-lbry-link">Open in LBRY</a>
+        <a href="<?php echo $claim->getLbryLink() ?>" class="open-lbry-link">Open in LBRY</a>
     </div>
 
     <div class="clear"></div>
@@ -165,14 +157,6 @@ if (strlen(trim($desc)) == 0) {
             }
 
             $autoThumbText = '';
-            $link = $claim->Name;
-            $rawLink = $claim->Name;
-            if (isset($claim->Publisher->Name)) {
-                $link = urlencode($claim->Publisher->Name) . '/' . $link;
-                $rawLink = $claim->Publisher->Name . '/' . $rawLink;
-            }
-            $link = 'lbry://' . $link;
-            $rawLink = 'lbry://' . $rawLink;
             $cost = '';
             if (isset($claim->Price) && $claim->Price > 0) {
                 $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
@@ -216,7 +200,7 @@ if (strlen(trim($desc)) == 0) {
 
             <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
                 <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                    <img src="<?php echo $claim->ThumbnailUrl ?>" alt="" />
+                    <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
                 <?php else: ?>
                     <div class="autothumb"><?php echo $autoThumbText ?></div>
                 <?php endif; ?>
@@ -224,7 +208,7 @@ if (strlen(trim($desc)) == 0) {
 
             <div class="metadata">
                 <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
-                <div class="link" title="<?php echo $rawLink ?>"><a href="<?php echo $link ?>" rel="nofollow"><?php echo $rawLink ?></a></div>
+                <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
 
                 <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>
 
@@ -291,14 +275,6 @@ if (strlen(trim($desc)) == 0) {
             $row++;
         }
         $autoThumbText = '';
-        $link = $claim->Name;
-        $rawLink = $claim->Name;
-        if (isset($claim->Publisher->Name)) {
-            $link = urlencode($claim->Publisher->Name) . '/' . $link;
-            $rawLink = $claim->Publisher->Name . '/' . $rawLink;
-        }
-        $link = 'lbry://' . $link;
-        $rawLink = 'lbry://' . $rawLink;
         $cost = '';
         if (isset($claim->Price) && $claim->Price > 0) {
             $cost = $this->Amount->formatCurrency($claim->Price) . ' LBC';
@@ -342,7 +318,7 @@ if (strlen(trim($desc)) == 0) {
 
         <div data-autothumb="<?php echo $autoThumbText ?>" class="thumbnail <?php echo $a[mt_rand(0, count($a) - 1)] ?>">
             <?php if (!$claim->IsNSFW && strlen(trim($claim->ThumbnailUrl)) > 0): ?>
-                <img src="<?php echo $claim->ThumbnailUrl ?>" alt="" />
+                <img src="<?php echo htmlspecialchars($claim->ThumbnailUrl) ?>" alt="" />
             <?php else: ?>
                 <div class="autothumb"><?php echo $autoThumbText ?></div>
             <?php endif; ?>
@@ -350,7 +326,7 @@ if (strlen(trim($desc)) == 0) {
 
         <div class="metadata">
             <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
-            <div class="link" title="<?php echo $rawLink ?>"><a href="<?php echo $link ?>" rel="nofollow"><?php echo $rawLink ?></a></div>
+            <div class="link" title="<?php echo $claim->getLbryLink() ?>"><a href="<?php echo $claim->getLbryLink() ?>" rel="nofollow"><?php echo $claim->getLbryLink() ?></a></div>
 
             <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>