diff --git a/source/Ox.UI/js/Video/AnnotationFolder.js b/source/Ox.UI/js/Video/AnnotationFolder.js
index e8f2036e..def56d93 100644
--- a/source/Ox.UI/js/Video/AnnotationFolder.js
+++ b/source/Ox.UI/js/Video/AnnotationFolder.js
@@ -257,10 +257,8 @@ Ox.AnnotationFolder = function(options, self) {
             sort: self.sort,
             submitOnBlur: false,
             tooltipText: self.options.showInfo ? function(item) {
-                return Ox.formatString('<b>{user}</b> {date}', {
-                    user: Ox.encodeHTMLEntities(item.user),
-                    date: item.date 
-                });
+                return Ox.encodeHTMLEntities(item.user) + ', '
+                    + Ox.formatDate(item.modified.slice(0, 10), '%B %e, %Y');
             } : '',
             width: self.options.width,
             maxHeight: self.options.type == 'text' ? Infinity : void 0,
diff --git a/source/Ox/js/HTML.js b/source/Ox/js/HTML.js
index 90330e03..bff193ea 100644
--- a/source/Ox/js/HTML.js
+++ b/source/Ox/js/HTML.js
@@ -254,6 +254,9 @@
         '<span class="c">foo <br>bar</span> baz'
     @*/
     Ox.highlight = function(string, query, classname, isHTML) {
+        if (!query) {
+            return string;
+        }
         var cursor = 0,
             entities = [],
             matches = [],