diff --git a/frontend/templates/base-questionnaire.html b/frontend/templates/base-questionnaire.html
index d2bac2d6..c597d0e7 100644
--- a/frontend/templates/base-questionnaire.html
+++ b/frontend/templates/base-questionnaire.html
@@ -2,7 +2,8 @@
 {% load landings %}
 {% block title %}{{ block.super }}Questionnaire{% endblock title %}
 {% block search_box %}
-<a href="{% render_with_landing "{{landing_object.last_campaign.publisher.url}}"|safe %}"><img style="float:left;margin:10px" src="{% render_with_landing "{{landing_object.last_campaign.publisher.logo_url}}"|safe %}" /></a>
+{% render_with_landing '' %}
+<a href="{{landing_object.publishers.0.url}}"><img style="float:left;margin:10px" src="{{landing_object.publishers.0.logo_url}}" /></a>
 {% endblock %}
 {% block signin %}
 {% endblock %}
diff --git a/questionnaire/fixtures/sampleSurvey.json b/questionnaire/fixtures/sampleSurvey.json
index 8935140b..b45f2d9b 100644
--- a/questionnaire/fixtures/sampleSurvey.json
+++ b/questionnaire/fixtures/sampleSurvey.json
@@ -44,7 +44,7 @@
       "parse_html": true, 
       "questionnaire": 3, 
       "sortid": 1, 
-      "text_en": " <h1> Introduction </h1> \r\n <p> \r\nWelcome, reader of <i>{{ landing_object.title }}</i>! And thanks for visiting Unglue.it to help us out with this \u2026\r\n </p> \r\n <p> \r\nAs Open Access publishers, {{ landing_object.last_campaign.publisher }} are truly committed to making academic research broadly accessible - so we want to understand how people like you are actually accessing and using our Open Access titles. \r\n </p> \r\n <p> \r\nWe have a bunch of questions for you (well - only 9 actually) about how you found this book and what you\u2019re going to do with it. Please tell us the things you think are interesting or relevant. We really want to know!\r\n </p> \r\n <p> \r\n[Privacy policy: There are no marketing traps, we\u2019re not going to surreptitiously drop cookies on you to carry around for us, or swamp you with emails afterwards, or tell our \u201cfriends\u201d about you - we\u2019re just going to store your answers to create a database of usage examples that can be used to understand what Open Access publishing enables."
+      "text_en": " <h1> Introduction </h1> \r\n <p> \r\nWelcome, reader of <i>{{ landing_object.title }}</i>! And thanks for visiting Unglue.it to help us out with this \u2026\r\n </p> \r\n <p> \r\nAs Open Access publishers, {{ landing_object.claim.all.0.rights_holder }} are truly committed to making academic research broadly accessible - so we want to understand how people like you are actually accessing and using our Open Access titles. \r\n </p> \r\n <p> \r\nWe have a bunch of questions for you (well - only 9 actually) about how you found this book and what you\u2019re going to do with it. Please tell us the things you think are interesting or relevant. We really want to know!\r\n </p> \r\n <p> \r\n[Privacy policy: There are no marketing traps, we\u2019re not going to surreptitiously drop cookies on you to carry around for us, or swamp you with emails afterwards, or tell our \u201cfriends\u201d about you - we\u2019re just going to store your answers to create a database of usage examples that can be used to understand what Open Access publishing enables."
     }, 
     "model": "questionnaire.questionset", 
     "pk": 5
@@ -68,7 +68,7 @@
       "parse_html": true, 
       "questionnaire": 3, 
       "sortid": 3, 
-      "text_en": " <p> We would really like to be able to follow up with some of the respondents to this questionnaire to ask them a few more questions - particularly if you\u2019ve told us something really interesting in a comment (for example). [There will also be a little reward (a free book no less!) for those of you we do contact in this way.] </p> \r\n\r\n <p> Thanks so much for your time and efforts answering these questions for us - we love you for it! </p> \r\n\r\n <p> We hope you enjoy <i>{{ landing_object.title }}</i>. </p> \r\n\r\n <p> {{ landing_object.last_campaign.publisher }} and Unglue.it </p> \r\n"
+      "text_en": " <p> We would really like to be able to follow up with some of the respondents to this questionnaire to ask them a few more questions - particularly if you\u2019ve told us something really interesting in a comment (for example). [There will also be a little reward (a free book no less!) for those of you we do contact in this way.] </p> \r\n\r\n <p> Thanks so much for your time and efforts answering these questions for us - we love you for it! </p> \r\n\r\n <p> We hope you enjoy <i>{{ landing_object.title }}</i>. </p> \r\n\r\n <p> {{ landing_object.claim.all.0.rights_holder }} and Unglue.it </p> \r\n"
     }, 
     "model": "questionnaire.questionset", 
     "pk": 7
diff --git a/questionnaire/templates/questionnaire/complete.en.html b/questionnaire/templates/questionnaire/complete.en.html
index 2136f039..2d3578da 100644
--- a/questionnaire/templates/questionnaire/complete.en.html
+++ b/questionnaire/templates/questionnaire/complete.en.html
@@ -3,5 +3,5 @@
 <h2>
     Thanks for completing the survey!  
 </h2>
-<p>{{ landing_object.last_campaign.publisher }}</p>
+<p>{{ landing_object.claim.all.0.rights_holder }}</p>
 {% endblock %}
diff --git a/questionnaire/templatetags/landings.py b/questionnaire/templatetags/landings.py
index d4a55b8e..85fa8a0e 100644
--- a/questionnaire/templatetags/landings.py
+++ b/questionnaire/templatetags/landings.py
@@ -4,9 +4,12 @@ register = django.template.Library()
 
 @register.simple_tag(takes_context=True)
 def render_with_landing(context, text):
-    block_context = Context({'landing_object' : context['runinfo'].landing.content_object})
+    if not context.has_key('landing_object') and context.has_key('runinfo'):
+        context['landing_object'] = context['runinfo'].landing.content_object
     if text:
         template = Template(text)
-        return template.render(block_context)
+        return template.render(context)
+    
     else:
-        return ''
\ No newline at end of file
+        return ''
+