diff --git a/content/farm/_index.md b/content/farm/_index.md
index 348d60630..372507e42 100644
--- a/content/farm/_index.md
+++ b/content/farm/_index.md
@@ -20,7 +20,7 @@ insert_anchor_links: "left"
 The People’s Internet is powered by an entirely new incentive model made possible by the ThreeFold Blockchain.
 
 
-<button>[Get a 3Node](https://shop.threefold.tech/)</button>
+<button>[Get a 3Node](https://marketplace.3node.global/)</button>
 
 {% end %}
 
@@ -104,7 +104,7 @@ Every month, you earn TFT for keeping the 3Node connected to the network.
 The Titan was designed to fit in any home or office. It's compact, optimized for performance, and comes plug-and-farm. Just connect the Titan to electricity and network to start earning. Yes, it's that simple!
 
 
-<button>[Get Titan](https://shop.threefold.tech/)</button>
+<button>[Get Titan](https://marketplace.3node.global/)</button>
 
 |||
 
diff --git a/templates/partials/person_card.html b/templates/partials/person_card.html
index 3f4a6cd2d..d13757820 100644
--- a/templates/partials/person_card.html
+++ b/templates/partials/person_card.html
@@ -12,7 +12,7 @@
             </div>
             <div class="my-2 flex flex-row items-start flex-wrap">
             {% for tag in post.taxonomies.memberships %}
-                <a href="{{'/memberships/' ~ tag}}" class="border-1 text-xs font-light bg-transparent hover:text-blue-700 py-1 px-2 mr-2 my-1 border hover:border-blue-500 border-gray-600 text-gray-700 rounded-full ">
+                <a href="{{'/memberships/' ~ tag | replace(from='_', to='-' )}}" class="border-1 text-xs font-light bg-transparent hover:text-blue-700 py-1 px-2 mr-2 my-1 border hover:border-blue-500 border-gray-600 text-gray-700 rounded-full ">
                     {{tag}}
                 </a>
             {% endfor %}
diff --git a/templates/person_page.html b/templates/person_page.html
index 7b379a3a6..b686e8b0f 100644
--- a/templates/person_page.html
+++ b/templates/person_page.html
@@ -32,7 +32,7 @@
                 </div>
             </div>
             {% for tag in page.taxonomies.memberships %}
-                <a href="{{'/memberships/' ~ tag}}" class="border-1 font-light text-xs bg-transparent hover:text-blue-700 py-2 px-4 mr-2 border hover:border-blue-500 border-gray-600 text-gray-700 rounded-full ">
+                <a href="{{'/memberships/' ~ tag | replace(from='_', to='-' )}}" class="border-1 font-light text-xs bg-transparent hover:text-blue-700 py-2 px-4 mr-2 border hover:border-blue-500 border-gray-600 text-gray-700 rounded-full ">
                     {{tag}}
                 </a>
             {% endfor %}