diff --git a/frontend/app/index.html b/frontend/app/index.html
index b6a370d2b7..dc172a5f24 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -251,6 +251,7 @@
     <script src="scripts/directives/user.js"></script>
     <script src="scripts/directives/userinfo.js"></script>
     <script src="scripts/directives/utils/autofocus.js"></script>
+    <script src="scripts/filters/custom-field-value.js"></script>
     <script src="scripts/filters/duration.js"></script>
     <script src="scripts/filters/ellipsis.js"></script>
     <script src="scripts/filters/fang.js"></script>
diff --git a/frontend/app/scripts/filters/custom-field-value.js b/frontend/app/scripts/filters/custom-field-value.js
new file mode 100644
index 0000000000..583749dabd
--- /dev/null
+++ b/frontend/app/scripts/filters/custom-field-value.js
@@ -0,0 +1,17 @@
+(function() {
+    'use strict';
+    angular.module('theHiveFilters').filter('customFieldValue', function() {
+        return function(customField) {
+            if(!customField) {
+                return '';
+            }
+
+            switch(customField.type) {
+                case 'date':
+                    return moment(customField.value).format('MM/DD/YY H:mm');
+                default:
+                    return customField.value;
+            }
+        };
+    });
+})();
diff --git a/frontend/app/styles/label.css b/frontend/app/styles/label.css
index f1522349a6..2aeadea342 100644
--- a/frontend/app/styles/label.css
+++ b/frontend/app/styles/label.css
@@ -1,13 +1,11 @@
 .double-val-label {
 	display: table;
-	/* margin: .2em .6em .3em; */
     margin-top: 0;
     margin-left: 0;
 }
 .double-val-label>span {
 	color: #ffffff;
 	display: table-cell;
-	/* font-size: 0.9em; */
 	font-weight: 400;
 	line-height: 1;
 	padding: .3em .6em;
@@ -25,10 +23,7 @@
 .double-val-label>span:last-child {
     border-bottom-right-radius: 0.25em;
     border-top-right-radius: .25em;
-    /* border-left: 1px dashed #777; */
     border-left: 1px dashed #3c8dbc;
-    /* background-color: #d2d6de;
-    color: #444; */
 }
 .double-val-label>span.primary {
 	background-color: #3c8dbc;
@@ -38,16 +33,3 @@
     background-color: #d2d6de;
     color: #444;
 }
-/*
-.double-val-label>span.success {
-	background-color: #5cb85c;
-}
-.double-val-label>span.info {
-	background-color: #5bc0de;
-}
-.double-val-label>span.warning {
-	background-color: #f0ad4e;
-}
-.double-val-label>span.danger {
-	background-color: #d9534f;
-} */
diff --git a/frontend/app/views/components/common/custom-field-labels.component.html b/frontend/app/views/components/common/custom-field-labels.component.html
index cf227347e4..b374c4e590 100644
--- a/frontend/app/views/components/common/custom-field-labels.component.html
+++ b/frontend/app/views/components/common/custom-field-labels.component.html
@@ -9,6 +9,6 @@
         ng-if="cf.value !== undefined && cf.value !== null">
 
         <span class="default" uib-tooltip="{{cf.description}}" tooltip-placement="top">{{$cmp.fieldsCache[cf.name].name || cf.name}}</span>
-        <span class="default">{{cf.value}}</span>
+        <span class="default">{{cf | customFieldValue}}</span>
     </span>
 </div>