diff --git a/knowledge/survey/base.py b/knowledge/survey/base.py
index 467cdff..3d0bc28 100644
--- a/knowledge/survey/base.py
+++ b/knowledge/survey/base.py
@@ -53,7 +53,10 @@ class Questionnaire(AdapterBase, Questionnaire):
 
     @property
     def questions(self):
-        for qug in self.questionGroups:
+        return self.getQuestions()
+
+    def getQuestions(self, personId=None):
+        for qug in self.getQuestionGroups(personId):
             for qu in qug.questions:
                 #qu.questionnaire = self
                 yield qu
diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py
index 888051e..011c6b9 100644
--- a/knowledge/survey/browser.py
+++ b/knowledge/survey/browser.py
@@ -122,7 +122,7 @@ class SurveyView(InstitutionMixin, ConceptView):
                                    questions=questions[idx:idx+3]))
             return [g for g in result if len(g['questions']) == 3]
         if self.adapted.noGrouping:
-            questions = list(self.adapted.questions)
+            questions = list(self.adapted.getQuestions(self.personId))
             questions.sort(key=lambda x: x.title)
             size = len(questions)
             bs = self.batchSize