diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index d0ee02d4..f40f118b 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-<a class="a-post" href="{{ .Destination | safeURL }}?utm_source=fundor333.com&utm_medium=link&utm_campaign=blogging&ref=fundor333.com"{{ with .Title}} title="{{ . }}"{{ end }} target="_blank">{{ .Text | safeHTML }}</a>
+<a class="a-post" href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }} target="_blank">{{ .Text | safeHTML }}</a>
diff --git a/layouts/_default/list.json.json b/layouts/_default/list.json.json
index 42e90661..b2d1ce9d 100644
--- a/layouts/_default/list.json.json
+++ b/layouts/_default/list.json.json
@@ -44,7 +44,7 @@
 		"date_published": "{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}",
 		"date_modified": "{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}",
 		"id": "{{ .Permalink }}",
-		"url": "{{ .Permalink }}",
+		"url": "{{ .Permalink }}?utm_source=fundor333.com&utm_medium=jsonfeed&utm_campaign=blogging&ref=fundor333feed.com",
 		{{ with .Params.author -}}
 		"authors": [
 			{
diff --git a/static/atom.xsl b/static/atom.xsl
index 13059a96..6e0e20db 100644
--- a/static/atom.xsl
+++ b/static/atom.xsl
@@ -60,7 +60,7 @@
       <h3>
         <a target="_blank">
           <xsl:attribute name="href">
-            <xsl:value-of select="atom:id"/>
+            <xsl:value-of select="atom:link"/>
           </xsl:attribute>
           <xsl:value-of select="atom:title"/>
         </a>