diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index bc673975d73..892416ce0b5 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -14,7 +14,6 @@
                     string="Lead" domain="[('type', '=', 'lead')]" context="{'type' : 'lead'}"/>
                 <filter icon="terp-personal+" name="opportunity"
                     string="Opportunity" domain="[('type', '=', 'opportunity')]" context="{'type' : 'opportunity'}"/>
-                <separator orientation="vertical"/>
                 <field name="name"/>
             </search>
         </field>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 696c8ed3a84..8f3063c0141 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -21,6 +21,22 @@
         <menuitem action="crm_claim_categ_action" name="Categories"
             id="menu_crm_case_claim-act" parent="menu_config_claim" />
 
+	    <!-- Claim Stage Search view -->
+    
+	    <record id="claim_stage_search" model="ir.ui.view">
+	        <field name="name">Claim Stage - Search</field>
+	        <field name="model">crm.case.stage</field>
+	        <field name="type">search</field>
+	        <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
+	        <field name="arch" type="xml">
+	            <data>
+	            	<xpath expr="//field[@name='name']" position="before">
+		                <filter icon="terp-personal-" name="claim"
+		                    string="Claim" domain="[('type', '=', 'claim')]"/>
+		        	</xpath>
+	            </data>
+	        </field>
+	    </record>
 
         <!-- Claim Stages -->
 
@@ -29,8 +45,8 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('type', '=', 'claim')]</field>
-            <field name="context">{'type':'claim'}</field>
+            <field name="search_view_id" ref="claim_stage_search"/>
+            <field name="context">{'search_default_claim':1}</field>
             <field name="help">You can create claim stages to categorize the status of every claim entered in the system. The stages define all the steps required for the resolution of a claim.</field>
         </record>
         
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 8c704347c67..b07821a4903 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -6,6 +6,24 @@
             groups="base.group_extended"
             parent="base.menu_base_config" sequence="8" />
 
+	    <!-- Fund Stage Search view -->
+	    
+	    <record id="fund_stage_search" model="ir.ui.view">
+	        <field name="name">Fund Stage - Search</field>
+	        <field name="model">crm.case.stage</field>
+	        <field name="type">search</field>
+	        <field name="inherit_id" ref="crm.crm_lead_stage_search"/>
+	        <field name="arch" type="xml">
+	        	<data>
+	            	<xpath expr="//field[@name='name']" position="before">
+						<filter icon="terp-dolar" name="fundraising"
+						    string="Fundraising" domain="[('type', '=', 'fundraising')]"/>
+					</xpath>
+	            </data>
+	        </field>
+	    </record>
+
+
         <!-- Fund Raising Categories Form View -->
 
         <record id="crm_fund_categ_action" model="ir.actions.act_window">
@@ -15,6 +33,7 @@
             <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
             <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
             <field name="context">{'object_id':'crm.fundraising'}</field>
+            <field name="search_view_id" ref="fund_stage_search"/>
             <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
         </record>
 
@@ -29,8 +48,7 @@
             <field name="res_model">crm.case.stage</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="domain">[('type', '=', 'fundraising')]</field>
-            <field name="context">{'type':'fundraising'}</field>
+            <field name="context">{'search_default_fundraising':1}</field>
             <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
         </record>