diff --git a/templates/random.html b/templates/random.html
index 6b8f307..b372a5c 100644
--- a/templates/random.html
+++ b/templates/random.html
@@ -6,20 +6,33 @@
 </head>
 
 <body>
-<h1>Geocode UK coordinates to Commons Category</h1>
-
-<p>Random</p>
+<h1>Geocode coordinates to Commons Category</h1>
 
 <p><a href="{{ url_for('index', lat=lat, lon=lon) }}">visit endpoint</a>
 
-| <a href="https://www.openstreetmap.org/#map=17/{{lat }}/{{ lon }}">view in OSM</a></p>
+| <a href="https://www.openstreetmap.org/#map=17/{{lat }}/{{ lon }}">view in OSM</a>
+
+{% if result.commons_cat %}
+| <a href="{{ result.commons_cat.url }}">Commons category</a>
+{% endif %}
+
+{% if result.wikidata %}
+  | <a href="https://www.wikidata.org/wiki/{{ result.wikidata }}">{{ result.wikidata }}</a>
+{% endif %}
+
+| <a href="{{ url_for('detail_page', lat=lat, lon=lon) }}">#</a>
+
+</p>
 
 <pre>{{ result | pprint }}</pre>
 
+{% if result.commons_cat %}
 <p>({{ lat }}, {{ lon }}, {{result.commons_cat.title | pprint }}),</p>
+{% endif %}
 
 {% for element in elements %}
-<pre>{{ element | pprint }}</pre>
+{% set tags = element.tags %}
+  <pre>{{ element | pprint }}</pre>
 {% endfor %}
 
 
