diff --git a/browser/common.py b/browser/common.py
index 5936abf..dcfaf13 100644
--- a/browser/common.py
+++ b/browser/common.py
@@ -252,6 +252,16 @@ class BaseView(GenericView, I18NView, SortableMixin):
                 result.append(view)
         return result
 
+    @Lazy
+    def urlParamString(self):
+        return self.getUrlParamString()
+
+    def getUrlParamString(self):
+        qs = self.request.get('QUERY_STRING')
+        if qs:
+            return '?' + qs
+        return ''
+
     @Lazy
     def principalId(self):
         principal = self.request.principal
diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 0386eb3..ca396ed 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -51,7 +51,7 @@
     <h1 tal:define="tabview item/tabview|nothing"
         tal:attributes="ondblclick item/openEditWindow">
       <a tal:omit-tag="python: level > 1"
-         tal:attributes="href request/URL"
+         tal:attributes="href string:${request/URL}${item/urlParamString}"
          tal:content="item/title">Title</a>
       <a title="Show tabular view"
          i18n:attributes="title"
diff --git a/browser/node.py b/browser/node.py
index c801466..733b8e6 100644
--- a/browser/node.py
+++ b/browser/node.py
@@ -120,6 +120,9 @@ class NodeView(BaseView):
                                     url=absoluteURL(p, self.request)))
         if self.virtualTarget:
             data.extend(self.virtualTarget.breadcrumbs())
+        if data and not '?' in data[-1]['url']:
+            if self.urlParamString:
+                data[-1]['url'] += self.urlParamString
         return data
 
     def viewModes(self):
diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py
index 93119d8..8d6207e 100644
--- a/knowledge/survey/browser.py
+++ b/knowledge/survey/browser.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2013 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2015 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -52,6 +52,16 @@ class SurveyView(ConceptView):
         self.registerDojo()
         return template.macros['survey']
 
+    @Lazy
+    def title(self):
+        title = self.context.title
+        personId = self.request.form.get('person')
+        if personId:
+            person = adapted(getObjectForUid(personId))
+            if person is not None:
+                return '%s: %s' % (title, person.title)
+        return title
+
     @Lazy
     def tabview(self):
         if self.editable:
@@ -147,6 +157,8 @@ class SurveyView(ConceptView):
         if 'submit' not in form:
             return []
         respManager = Responses(self.context)
+        respManager.personId = (self.request.form.get('person') or 
+                                respManager.getPersonId())
         data = {}
         response = Response(self.adapted, None)
         for key, value in form.items():
@@ -222,7 +234,10 @@ class SurveyView(ConceptView):
     def getValues(self, question):
         setting = None
         if self.data is None:
-            self.data = Responses(self.context).load()
+            respManager = Responses(self.context)
+            respManager.personId = (self.request.form.get('person') or 
+                                    respManager.getPersonId())
+            self.data = respManager.load()
         if self.data:
             setting = self.data.get(question.uid)
         if setting is None:
diff --git a/knowledge/survey/view_macros.pt b/knowledge/survey/view_macros.pt
index 35a26f5..d5adc7d 100644
--- a/knowledge/survey/view_macros.pt
+++ b/knowledge/survey/view_macros.pt
@@ -45,7 +45,7 @@
     <div class="button" id="show_questionnaire">
       <a href="" xxonclick="back(); return false"
          i18n:translate=""
-         tal:attributes="href view/virtualTargetUrl">
+         tal:attributes="href string:${request/URL}${item/urlParamString}">
         Back to Questionnaire</a>
       <br />
     </div>
@@ -67,6 +67,10 @@
     </div>
     <form method="post">
       <table class="listing">
+        <input type="hidden" name="person"
+               tal:define="personId request/person|nothing"
+               tal:condition="personId"
+               tal:attributes="value personId" />
         <tal:group repeat="group item/groups">
           <tr>
             <td>&nbsp;</td>