diff --git a/assets/layers/artwork/artwork.json b/assets/layers/artwork/artwork.json
index 6961247b4..fe291aaae 100644
--- a/assets/layers/artwork/artwork.json
+++ b/assets/layers/artwork/artwork.json
@@ -144,6 +144,9 @@
       }
     }
   ],
+  "calculatedTags": [
+    "website:=feat.properties.website ?? feat.properties.url"
+  ],
   "tagRenderings": [
     "images",
     {
@@ -612,7 +615,8 @@
       },
       "freeform": {
         "key": "website",
-        "type": "url"
+        "type": "url",
+        "addExtraTags": ["url="]
       },
       "id": "artwork-website",
       "labels": [
@@ -744,4 +748,4 @@
   "filter": [
     "has_image"
   ]
-}
\ No newline at end of file
+}