diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index a550ae78da5..2f9b71b3bb5 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+      <!--Users-->
       <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('fleet.group_fleet_user'))]" />
+        <field name="groups_id" eval="[(4, ref('fleet.group_fleet_manager'))]" />
       </record>
 
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index a8f6a321daf..5040e0f894c 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -43,6 +43,7 @@
                 </form>
             </field>
         </record>
+
         <record model='ir.ui.view' id='fleet_vehicle_model_tree'>
             <field name="name">fleet.vehicle.model.tree</field>
             <field name="model">fleet.vehicle.model</field>
@@ -555,7 +556,7 @@
                 </tree>
             </field>
         </record>
-        <!--
+        
         <record model='ir.ui.view' id='fleet_vehicle_odometer_search'>
             <field name="name">fleet.vehicle.odometer.search</field>
             <field name="model">fleet.vehicle.odometer</field>
@@ -565,11 +566,12 @@
                     <field name="value"/>
                     <field name="unit"/>
                     <field name="date"/>
-                    <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    </group>
                 </search>
             </field>
         </record>
-        -->
 
         <record model="ir.ui.view" id="fleet_vehicle_odometer_graph">
            <field name="name">fleet.vehicle.odometer.graph</field>
@@ -661,6 +663,23 @@
                 </tree>
             </field>
         </record>
+        
+        <record model='ir.ui.view' id='fleet_vehicle_log_fuel_search'>
+            <field name="name">fleet.vehicle.log.fuel.search</field>
+            <field name="model">fleet.vehicle.log.fuel</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles Fuel Logs" >
+                    <field name="vehicle_id" />
+                    <field name="date"/>
+                    <field name="purchaser_id" />
+                    <field name="liter" />
+                    <field name="amount" sum="Price"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="fleet_vehicle_log_fuel_graph">
            <field name="name">fleet.vehicle.log.fuel.graph</field>
@@ -680,6 +699,7 @@
             <field name="res_model">fleet.vehicle.log.fuel</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_groupby_vehicle" : True}</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a new fuel log. 
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index b7dcc2bdb83..0ed80499e4d 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -4,7 +4,7 @@
 
         <!-- Users -->
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]"/>
+            <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_manager'))]"/>
         </record>
 
         <!-- Categories -->