diff --git a/ckanext/odsh/templates/organization/read_base.html b/ckanext/odsh/templates/organization/read_base.html
index e89ac5914c12214af422928fecf6956553ca9b66..6277b79f8023d13753e6e112887557ca87c16119 100644
--- a/ckanext/odsh/templates/organization/read_base.html
+++ b/ckanext/odsh/templates/organization/read_base.html
@@ -1,11 +1,11 @@
 {% extends "page.html" %}
 
-{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}
+{% block subtitle %}{{ group_dict.display_name }} - {{ _('Organizations') }}{% endblock %}
 
 {% block breadcrumb_content %}
-<li>{% link_for _('Organizations'), controller='organization', action='index' %}</li>
-<li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read',
-    id=c.group_dict.name %}</li>
+<li>{% link_for _('Organizations'), named_route=group_type+'.index' %}</li>
+<li class="active">{% link_for group_dict.display_name|truncate(35), named_route=group_type+'.read',
+    id=group_dict.name %}</li>
 {% endblock %}
 
 {% block content_action %}
@@ -14,16 +14,16 @@
 {% block page_header %}
 <div class="odsh-dataset-heading">
     <div class="pull-right">
-        {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-        {% link_for _('Manage'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-primary btn-add-dataset',
+        {% if h.check_access('organization_update', {'id': group_dict.id}) %}
+        {% link_for _('Manage'), named_route=group_type+'.edit', id=group_dict.name, class_='btn btn-primary btn-add-dataset',
         icon='wrench' %}
         {% endif %}
     </div>
-    <h2> {{ c.group_dict.title or c.group_dict.name }} </h2>
+    <h2> {{ group_dict.title or group_dict.name }} </h2>
 </div>
-{% if c.group_dict.description %}
+{% if group_dict.description %}
 <div class="organizaion-full-description with-bottom-line">
-    {{ h.render_markdown(c.group_dict.description) }}
+    {{ h.render_markdown(group_dict.description) }}
 </div>
 {% else %}
 <p class="empty">{{ _('There is no description for this organization') }}</p>
@@ -32,7 +32,7 @@
 
 
 {% block secondary_content %}
-{% set organization = c.group_dict %}
+{% set organization = group_dict %}
 <div class='organization-image-container'>
 <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}"
     alt="{{ organization.name }}" class="organization-image-info">