diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 313ba3189f9..40653f01ff3 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -169,7 +169,8 @@ class res_partner_address(osv.osv):
     _inherit = 'res.partner.address'
 
     def _default_location_id(self, cr, uid, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         if not context.get('default_partner_id',False):
             return False
         ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
@@ -242,7 +243,8 @@ class res_partner_address(osv.osv):
     }
 
     def default_get(self, cr, uid, fields=[], context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         if 'default_type' in context:
             del context['default_type']
         return super(res_partner_address, self).default_get(cr, uid, fields, context)
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 475d85a5c1e..10d8de984c2 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -91,7 +91,7 @@
         <field name="arch" type="xml">
             <search string="Partner Contact">
                 <field name="name" string="First/Lastname"
-                    filter_domain="['|', ('firstname','ilike', self), ('lastname','ilike',self)]"/>
+                    filter_domain="['|', ('first_name','ilike', self), ('last_name', 'ilike', self)]"/>
                 <field name="partner_id" string="Partner"/>
             </search>
         </field>