diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index f59508c..660f1a0 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -61,7 +61,7 @@ $desc = $claim->Description;
 if (strlen(trim($desc)) == 0) {
     $desc = '<em>No description available.</em>';
 } else {
-    $desc = preg_replace('#((https?|ftp|lbry)://(\S*?\.\S*?))([\s)\[\]{},;"\':<]|\.\s|$)#i','<a href="$1" target="_blank" rel="nofollow">$1</a>$4', $desc);
+    $desc = preg_replace('#((https?|ftp|lbry)://([A-Za-z0-9\-\/]+|\S*?\.\S*?))([\s)\[\]{},;"\':<]|\.\s|$)#i','<a href="$1" target="_blank" rel="nofollow">$1</a>$4', $desc);
     $desc = preg_replace('/(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/is', '<a href="mailto:$0" rel="nofollow">$0</a>', $desc);
 }
 
@@ -218,7 +218,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 $link ?>><a href="<?php echo $link ?>" rel="nofollow"><?php echo $link ?></a></div>
+                <div class="link" title="<?php echo $link ?>"><a href="<?php echo $link ?>" rel="nofollow"><?php echo $link ?></a></div>
 
                 <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>