diff --git a/bin/download_dependencies b/bin/download_dependencies
index 3b18f8c2..24d42ef9 100755
--- a/bin/download_dependencies
+++ b/bin/download_dependencies
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+curl -H "Accept: application/json" -H "Content-Type: application/sparql-query" -H "User-Agent: OpenStreetBrowser" -XPOST -d @'lib/tag2link-wikidata.qry' https://query.wikidata.org/sparql > data/tag2link-wikidata.json
+curl -H "Accept: application/json" -H "Content-Type: application/sparql-query" -H "User-Agent: OpenStreetBrowser" -XPOST -d @'lib/tag2link-sophox.qry' https://sophox.org/sparql > data/tag2link-sophox.json
+
 mkdir -p data/GeoIP
 cd data/GeoIP
 wget -O- http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz | tar --strip-components=1 -xvzf -
diff --git a/lib/tag2link-sophox.qry b/lib/tag2link-sophox.qry
new file mode 100644
index 00000000..56304f8f
--- /dev/null
+++ b/lib/tag2link-sophox.qry
@@ -0,0 +1,6 @@
+SELECT ?item (CONCAT("Key:", ?permanent_key_ID) as ?OSM_key) ?formatter_URL WHERE {
+  FILTER(?permanent_key_ID NOT IN ('image', 'url', 'website', 'wikidata', 'wikimedia_commons')).
+  ?item osmdt:P2 osmd:Q7.
+  ?item osmdt:P16 ?permanent_key_ID.
+  ?item osmdt:P8 ?formatter_URL.
+}
diff --git a/lib/tag2link-wikidata.qry b/lib/tag2link-wikidata.qry
new file mode 100644
index 00000000..313d2443
--- /dev/null
+++ b/lib/tag2link-wikidata.qry
@@ -0,0 +1,11 @@
+SELECT ?item ?OSM_key ?formatter_URL WHERE {
+  { ?item wdt:P1282 ?OSM_key. }
+  FILTER(STRSTARTS(?OSM_key, 'Key:')) .
+  FILTER(?OSM_key NOT IN ('Key:image', 'Key:url', 'Key:website', 'Key:wikidata', 'Key:wikimedia_commons')) .
+
+  {
+    { ?item wdt:P1630 ?formatter_URL. }
+    UNION
+    { ?item wdt:P3303 ?formatter_URL. }
+  }
+}