diff --git a/country.py b/country.py
index 26f07674e3..72bc213abd 100644
--- a/country.py
+++ b/country.py
@@ -197,9 +197,10 @@ class Subdivision(ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        if cls.search([('code',) + tuple(clause[1:])], limit=1):
-            return [('code',) + tuple(clause[1:])]
-        return [(cls._rec_name,) + tuple(clause[1:])]
+        return ['OR',
+            ('name',) + tuple(clause[1:]),
+            ('code',) + tuple(clause[1:]),
+            ]
 
     @classmethod
     def create(cls, vlist):