diff -r 7b2dcd2b31c1 -r 74fba571487e common/corpus-common-addon/addon/templates/components/doc-location.hbs
--- a/common/corpus-common-addon/addon/templates/components/doc-location.hbs	Mon Feb 06 16:05:02 2017 +0100
+++ b/common/corpus-common-addon/addon/templates/components/doc-location.hbs	Wed Feb 08 15:25:24 2017 +0100
@@ -1,8 +1,12 @@
 {{#if isLocationLink}}
-<a href="{{url}}" target="_blank" title="{{url}}" class="bo-doc-ref-link doc-link-geonames">
+  {{#if onClick }}
+    <span {{ action onClick }} title={{url}} class="bo-doc-ref-link doc-link-geonames">{{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}</span>
+  {{else}}
+    <a href="{{url}}" target="_blank" title="{{url}}" class="bo-doc-ref-link doc-link-geonames">
+      {{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}
+    </a>
+  {{/if}}
+  {{#if displayUrlLink}}<a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-url doc-link-geonames-url">&nbsp;</a>{{/if}}
+{{else}}
   {{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}
-</a>
-{{#if displayUrlLink}}<a href="{{url}}" target="_blank" title={{url}} class="bo-doc-ref-url doc-link-geonames-url">&nbsp;</a>{{/if}}
-{{else}}
-{{#if resolvedLabel}}{{resolvedLabel}}{{else}}{{code}}{{/if}}
 {{/if}}