diff --git a/ckanext/odsh/templates/package/read.html b/ckanext/odsh/templates/package/read.html
index 34da5ee1fa035c942a6b95f81a29d9755bc01a4a..d0bfd4be50e2de1592e59e00439d9097dec68415 100644
--- a/ckanext/odsh/templates/package/read.html
+++ b/ckanext/odsh/templates/package/read.html
@@ -14,12 +14,19 @@
 {% set dataset = h.dataset_display_name(pkg) %}
 {% if pkg.organization %}
 {% set organization = h.get_translated(pkg.organization, 'title') or pkg.organization.name %}
-<li>{% link_for organization|truncate(30), controller='organization', action='read', id=pkg.organization.name %}</li>
+<li>
+    <a href={% url_for controller='organization', action='read', id=pkg.organization.name %} title={{ organization }}>
+        {{ organization|truncate(30) }}
+    </a>
+</li>
 {% else %}
 <li>{% link_for _('Documents'), controller='package', action='search' %}</li>
 {% endif %}
-<li {{ self.breadcrumb_content_selected() }}>{% link_for dataset|truncate(30), controller='package', action='read',
-  id=pkg.name %}</li>
+<li>
+    <a href={% url_for controller='package', action='read', id=pkg.name %} title={{ dataset }}>
+        {{ dataset|truncate(30) }}
+    </a>
+</li>
 {% else %}
 <li>{% link_for _('Documents'), controller='package', action='search' %}</li>
 <li class="active"><a href="">{{ _('Create Dataset') }}</a></li>