diff --git a/ckanext/data_qld/templates/datarequests/close.html b/ckanext/data_qld/templates/datarequests/close.html
index be65bcb8..d342d7ba 100644
--- a/ckanext/data_qld/templates/datarequests/close.html
+++ b/ckanext/data_qld/templates/datarequests/close.html
@@ -2,10 +2,12 @@
 {#
 Handle either old Pylons-style global variables, or newer template parameters.
 #}
-{% set datasets = datasets or c.datasets %}
-{% set datarequest = datarequest or c.datarequest %}
-{% set errors = errors or c.errors %}
-{% set errors_summary = errors_summary or c.errors_summary %}
+{% if datarequest is not defined %}
+    {% set datarequest = c.datarequest %}
+    {% set datasets = c.datasets %}
+    {% set errors = c.errors %}
+    {% set errors_summary = c.errors_summary %}
+{% endif %}
 
 {% block subtitle %}{{ _('Close data request') }}{% endblock %}
 
diff --git a/ckanext/data_qld/templates/datarequests/comment.html b/ckanext/data_qld/templates/datarequests/comment.html
index 68e9497a..05638f96 100644
--- a/ckanext/data_qld/templates/datarequests/comment.html
+++ b/ckanext/data_qld/templates/datarequests/comment.html
@@ -11,8 +11,10 @@
   {#
   Handle either old Pylons-style global variables, or newer template parameters.
   #}
-  {% set datarequest = datarequest or c.datarequest %}
-  {% set userobj = userobj or c.userobj %}
-  {% snippet "package/comment_list.html", content_type='datarequest', pkg_id=datarequest.id, pkg_name=datarequest.id, userobj=userobj %}
+  {% if datarequest is not defined %}
+    {% set datarequest = c.datarequest %}
+  {% endif %}
+
+  {% snippet "package/comment_list.html", content_type='datarequest', pkg_id=datarequest.id, pkg_name=datarequest.id, userobj=g.userobj %}
 
 {% endblock %}
diff --git a/ckanext/data_qld/templates/datarequests/edit.html b/ckanext/data_qld/templates/datarequests/edit.html
index c975940d..83cf4b0e 100644
--- a/ckanext/data_qld/templates/datarequests/edit.html
+++ b/ckanext/data_qld/templates/datarequests/edit.html
@@ -2,10 +2,12 @@
 {#
 Handle either old Pylons-style global variables, or newer template parameters.
 #}
-{% set datarequest = datarequest or c.datarequest %}
-{% set errors = errors or c.errors %}
-{% set errors_summary = errors_summary or c.errors_summary %}
-{% set original_title = original_title or c.original_title %}
+{% if datarequest is not defined %}
+    {% set datarequest = c.datarequest %}
+    {% set errors = c.errors %}
+    {% set errors_summary = c.errors_summary %}
+    {% set original_title = c.original_title %}
+{% endif %}
 
 {% block subtitle %}{{ _('Edit data request') }}{% endblock %}
 
diff --git a/ckanext/data_qld/templates/datarequests/index.html b/ckanext/data_qld/templates/datarequests/index.html
index 147310d0..005cbb05 100644
--- a/ckanext/data_qld/templates/datarequests/index.html
+++ b/ckanext/data_qld/templates/datarequests/index.html
@@ -6,7 +6,7 @@
       {% link_for _('Add data request'), named_route='datarequest.new', class_='btn btn-primary', icon=h.get_plus_icon() %}
     </div>
   {% endif %}
-  {% if not c.user %}
+  {% if not g.user %}
     <div class="page_primary_action">
       {% link_for _('Login to create data request'), named_route='user.login', class_='btn btn-primary', came_from=h.full_current_url() %}
     </div>
diff --git a/ckanext/data_qld/templates/datarequests/new.html b/ckanext/data_qld/templates/datarequests/new.html
index d56bc245..f238ff9d 100644
--- a/ckanext/data_qld/templates/datarequests/new.html
+++ b/ckanext/data_qld/templates/datarequests/new.html
@@ -2,9 +2,11 @@
 {#
 Handle either old Pylons-style global variables, or newer template parameters.
 #}
-{% set datarequest = datarequest or c.datarequest %}
-{% set errors = errors or c.errors %}
-{% set errors_summary = errors_summary or c.errors_summary %}
+{% if datarequest is not defined %}
+    {% set datarequest = c.datarequest %}
+    {% set errors = c.errors %}
+    {% set errors_summary = c.errors_summary %}
+{% endif %}
 
 {% block subtitle %}{{ _('Create data request') }}{% endblock %}
 
diff --git a/ckanext/data_qld/templates/datarequests/show.html b/ckanext/data_qld/templates/datarequests/show.html
index 1d710e2c..e882f498 100644
--- a/ckanext/data_qld/templates/datarequests/show.html
+++ b/ckanext/data_qld/templates/datarequests/show.html
@@ -2,7 +2,9 @@
 {#
 Handle either old Pylons-style global variables, or newer template parameters.
 #}
-{% set datarequest = datarequest or c.datarequest %}
+{% if datarequest is not defined %}
+    {% set datarequest = c.datarequest %}
+{% endif %}
 
 {% block title %}Data request {{datarequest.get('title', '')}}{% endblock %}
 
diff --git a/ckanext/data_qld/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/data_qld/templates/datarequests/snippets/close_datarequest_form.html
index a0a19527..e23e1739 100644
--- a/ckanext/data_qld/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/data_qld/templates/datarequests/snippets/close_datarequest_form.html
@@ -5,7 +5,7 @@
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accepted dataset") }}</label>
       <div class="controls">
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
-    	  <option value="" selected="selected">No Dataset</option>
+          <option value="" selected="selected">No Dataset</option>
           {% for dataset in datasets  %}
             <option value="{{ dataset.get('name') }}">{{ dataset.get('title') }}</option>
           {% endfor %}
diff --git a/ckanext/data_qld/templates/header.html b/ckanext/data_qld/templates/header.html
index 52a13205..5e3190d2 100644
--- a/ckanext/data_qld/templates/header.html
+++ b/ckanext/data_qld/templates/header.html
@@ -6,9 +6,9 @@
 <div class="account-masthead">
   <div class="container">
     {% block header_account_container_content %} {% if g.userobj %}
-    <div class="account avatar authed" data-module="me" data-me="{{ c.userobj.id }}">
+    <div class="account avatar authed" data-module="me" data-me="{{ g.userobj.id }}">
       <ul class="unstyled">
-        {% block header_account_logged %} {% if c.userobj.sysadmin %}
+        {% block header_account_logged %} {% if g.userobj.sysadmin %}
         <li>CKAN {{ h.ckan_version() }}</li>
         <li>
           <a href="{{ h.url_for('admin.index') }}" title="{{ _('Sysadmin settings') }}">
@@ -18,9 +18,9 @@
         </li>
         {% endif %}
         <li>
-          <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
-                  {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
-                  <span class="username">{{ c.userobj.display_name }}</span>
+          <a href="{{ h.url_for('user.read', id=g.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+                  {{ h.gravatar((g.userobj.email_hash if g and g.userobj else ''), size=22) }}
+                  <span class="username">{{ g.userobj.display_name }}</span>
                 </a>
         </li>
         {% set new_activities = h.new_activities() %}
diff --git a/ckanext/data_qld/templates/report/view.html b/ckanext/data_qld/templates/report/view.html
index eab53e51..e384a3f1 100644
--- a/ckanext/data_qld/templates/report/view.html
+++ b/ckanext/data_qld/templates/report/view.html
@@ -9,7 +9,7 @@ <h1>{{ report.title }}</h1>
     <p>
         {{ _('Generated') }}: {{ h.report__render_datetime(report_date, '%d/%m/%Y %H:%M') }}
     </p>
-    {% if c.userobj.sysadmin %}
+    {% if g.userobj.sysadmin %}
     <div class="panel panel-info" style="width=700px">
         <div class="panel-heading"><strong>{% trans %}Refresh report{% endtrans %}</strong></div>
         <div class="panel-body">
diff --git a/ckanext/data_qld/templates/scheming/package/resource_read.html b/ckanext/data_qld/templates/scheming/package/resource_read.html
index 736a01a1..9d18c879 100644
--- a/ckanext/data_qld/templates/scheming/package/resource_read.html
+++ b/ckanext/data_qld/templates/scheming/package/resource_read.html
@@ -40,7 +40,7 @@
     {%- do exclude_fields.append('governance_acknowledgement') -%}
   {%- endif -%}
 
-  {% if not h.resource_visibility_has_user_permission_for_org(pkg['owner_org'], c.userobj, 'create_dataset') %}
+  {% if not h.resource_visibility_has_user_permission_for_org(pkg['owner_org'], g.userobj, 'create_dataset') %}
     {%- do exclude_fields.append('request_privacy_assessment') -%}
     {%- do exclude_fields.append('privacy_assessment_result') -%}
   {% endif %}