diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index 529140b2621..2729cc25a51 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -18,7 +18,6 @@
         "wiki_view.xml",
         "data/wiki_quickstart.xml",
         "data/wiki_main.xml",
-        "data/wiki_faq.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki/data/wiki_faq.xml
index a1a052db625..eabd591d232 100644
--- a/addons/wiki/data/wiki_faq.xml
+++ b/addons/wiki/data/wiki_faq.xml
@@ -4,10 +4,9 @@
         <record id="wiki_groups_faq" model="wiki.groups">
             <field name="name">Internal FAQ</field>
             <field eval="2" name="section"/>
-            <field name="template">
-== Question ==
+            <field name="template">== Question ==
 
-What's the Document Management System ?
+...
 
 == Answer ==
 
diff --git a/addons/wiki/data/wiki_quickstart.xml b/addons/wiki/data/wiki_quickstart.xml
index 23b35675078..8d6a4d3656e 100644
--- a/addons/wiki/data/wiki_quickstart.xml
+++ b/addons/wiki/data/wiki_quickstart.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
-		<record id="wiki_groups_help0" model="wiki.groups">
-			<field name="name">Help</field>
-			<field eval="1" name="section"/>
-		</record>
-	</data>
 	<data>
 		<record id="wiki_groups_wikiformatting0" model="wiki.groups">
-			<field name="name">Wiki Formatting</field>
-			<field name="parent_id" ref="wiki_groups_help0"/>
+			<field name="name">Help - Using The Wiki</field>
 			<field eval="1" name="section"/>
 		</record>
-	</data>
-	<data>
 		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
 			<field name="name">Basic Wiki Editing</field>
 			<field name="tags">help, quick start, wiki, formatting</field>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index f5329405b8c..0d6e69ca6c2 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -172,7 +172,6 @@
 
         <act_window
             domain="[('group_id', 'child_of', active_ids)]"
-            context="{'group_id': active_ids}"
             id="act_wiki_group_open"
             name="Wiki Pages"
             res_model="wiki.wiki"