diff --git a/source/UI/js/Video/AnnotationFolder.js b/source/UI/js/Video/AnnotationFolder.js
index 4a1be579..16603e64 100644
--- a/source/UI/js/Video/AnnotationFolder.js
+++ b/source/UI/js/Video/AnnotationFolder.js
@@ -294,7 +294,10 @@ Ox.AnnotationFolder = function(options, self) {
             //autocompleteReplaceCorrect: true,
             autocompleteSelect: true,
             autocompleteSelectHighlight: true,
-            autocompleteSelectMaxWidth: 256
+            autocompleteSelectMaxWidth: 256,
+            format: function(value) {
+                return Ox.stripTags(value);
+            }
         } : {}))
         .bindEvent({
             add: function(data) {
@@ -440,8 +443,9 @@ Ox.AnnotationFolder = function(options, self) {
         });
         if (self.options.type == 'entity') {
             annotations = annotations.map(function(annotation) {
-                annotation.value = annotation.value + ' <a href="/entities/'
-                    + annotation.entity.id + '">\u24D8</a>';
+                annotation.value = '<a href="/entities/'
+                    + annotation.entity.id + '">'
+                    + annotation.value + '</a>';
                 return annotation;
             });
         }