diff --git a/pandora/item/managers.py b/pandora/item/managers.py
index 9ee40327..ee7412b3 100644
--- a/pandora/item/managers.py
+++ b/pandora/item/managers.py
@@ -61,7 +61,7 @@ def parseCondition(condition):
     if key_type == "string":
         in_find=True
         value_key = 'find__value'
-        if k in models.Item.facet_keys:
+        if k in models.Item.facet_keys + ['title']:
             in_find = False
             if op == '=' or op == '^$':
                 v = models.Item.objects.filter(facets__key=k, facets__value=v)
diff --git a/pandora/item/models.py b/pandora/item/models.py
index 49860f2f..9e97b90a 100644
--- a/pandora/item/models.py
+++ b/pandora/item/models.py
@@ -657,8 +657,10 @@ class Item(models.Model):
 
     def update_facets(self):
         #FIXME: what to do with Unkown Director, Year, Country etc.
-        for key in self.facet_keys:
+        for key in self.facet_keys + ['title']:
             current_values = self.get(key, [])
+            if key == 'title':
+                current_values += self.get('original_title', [])
             #FIXME: is there a better way to build name collection?
             if key == 'name':
                 current_values = []