diff --git a/pandora/annotation/models.py b/pandora/annotation/models.py
index 6678e239..69cc0789 100644
--- a/pandora/annotation/models.py
+++ b/pandora/annotation/models.py
@@ -130,7 +130,7 @@ class Annotation(models.Model):
         layer = self.get_layer()
         if self.value:
             self.value = utils.cleanup_value(self.value, layer['type'])
-            self.findvalue = ox.decodeHtml(ox.stripTags(self.value).strip()).replace('\n ', ' ')
+            self.findvalue = ox.decodeHtml(ox.stripTags(self.value).strip()).replace('\n', ' ')
             sortvalue = sort_string(self.findvalue)
             if sortvalue:
                 self.sortvalue = sortvalue[:900]
diff --git a/pandora/annotation/tasks.py b/pandora/annotation/tasks.py
index d828d5ac..4dc6ad19 100644
--- a/pandora/annotation/tasks.py
+++ b/pandora/annotation/tasks.py
@@ -25,9 +25,9 @@ def update_matching_events(id):
 
     names = {}
     for n in Event.objects.all().values('id', 'name', 'alternativeNames'):
-        names[n['id']] = [ox.decodeHtml(n) for n in [n['name']] + json.loads(n['alternativeNames'])]
+        names[n['id']] = [ox.decodeHtml(x) for x in [n['name']] + json.loads(n['alternativeNames'])]
 
-    value = a.findvalue.lower().replace('\n', ' ')
+    value = a.findvalue.lower()
     update = []
     for i in names:
         for name in names[i]:
@@ -54,8 +54,8 @@ def update_matching_places(id):
     
     names = {}
     for n in Place.objects.all().values('id', 'name', 'alternativeNames'):
-        names[n['id']] = [n['name']] + json.loads(n['alternativeNames'])
-    value = a.value.lower()
+        names[n['id']] = [ox.decodeHtml(x) for x in [n['name']] + json.loads(n['alternativeNames'])]
+    value = a.findvalue.lower()
     update = []
     for i in names:
         for name in names[i]: