diff --git a/capsule-prototype/css/online-theme.css b/capsule-prototype/css/online-theme.css
index a35e65bf71101cae0c040fa0924d918b4f763182..a1eeef556ddc68d4e77e23994a463b9c5021fa02 100644
--- a/capsule-prototype/css/online-theme.css
+++ b/capsule-prototype/css/online-theme.css
@@ -352,6 +352,9 @@ html, body {
 .mosaic_filter_disabled>h2:after {
     background-image: url('images/icn-menu-filter.png');
 }
+.mosaic_filter_item>h2, .mosaic_category h2 {
+    text-transform: capitalize;
+}
 
 .mosaic_filter_item:not(.mosaic_filter_disabled)>h2:after{
     background-image: url('images/icn-menu-preview.png');
diff --git a/capsule-prototype/js/rekall/Sorting.js b/capsule-prototype/js/rekall/Sorting.js
index 62550671dccac736d94dc4ba8416ce2627667f91..2e527cbd3c7d69d16763c5fcd1acbb6a9ef05394 100644
--- a/capsule-prototype/js/rekall/Sorting.js
+++ b/capsule-prototype/js/rekall/Sorting.js
@@ -338,11 +338,8 @@ Sorting.prototype.getCategory = function(tag) {
 }
 
 Sorting.prototype.getCategoryName = function(metadata) {
-    if ('_rekall/link' === metadata) {
-        return 'Link';
-    }
     if ('_rekall/marker' === metadata) {
-        return 'Note';
+        return 'note';
     }
-    return metadata.substr(7).toUpperCase();
+    return metadata.split("/").pop().split('.').pop();
 }