diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index fb024dd1a3a..71308add4df 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -384,7 +384,7 @@ class survey_question(osv.Model):
         'page_id': fields.many2one('survey.page', 'Survey page',
             ondelete='cascade'),
         'survey_id': fields.related('page_id', 'survey_id', type='many2one',
-            relation='survey.survey', string='Survey', store=True),
+            relation='survey.survey', string='Survey'),
         'parent_id': fields.many2one('survey.question', 'Parent question',
             ondelete='cascade'),
         'sequence': fields.integer(string='Sequence'),
diff --git a/addons/survey/views/survey_views.xml b/addons/survey/views/survey_views.xml
index 9e0e5f4b5eb..16ff981382e 100644
--- a/addons/survey/views/survey_views.xml
+++ b/addons/survey/views/survey_views.xml
@@ -500,8 +500,8 @@
                     <field name="page_id"/>
                     <field name="type"/>
                     <group expand="1" string="Group by...">
-                        <filter name="group_by_survey" string="Survey" domain="[]"  context="{'group_by':'survey_id'}"/>
-                        <filter name="group_by_page" string="Page" domain="[]"  context="{'group_by':'page_id'}"/>
+<!--                         <filter name="group_by_survey" string="Survey" domain="[]"  context="{'group_by':'survey_id'}"/>
+ -->                        <filter name="group_by_page" string="Page" domain="[]"  context="{'group_by':'page_id'}"/>
                     </group>
                 </search>
             </field>
@@ -514,7 +514,8 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="survey_question_tree"></field>
             <field name="search_view_id" ref="survey_question_search"/>
-            <field name="context">{'search_default_group_by_survey': True, 'search_default_group_by_page': True}</field>
+<!--             <field name="context">{'search_default_group_by_survey': True, 'search_default_group_by_page': True}</field>
+ -->            <field name="context">{'search_default_group_by_page': True}</field>
         </record>
 
         <!-- LABELS -->