diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
index cb8c84020f..f3518d5895 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
@@ -132,7 +132,7 @@
 
 #history-filter-dialog {
     display: none;
-    width: 454px;
+    width: 421px;
     height: 250px;
     z-index: 1301;
 }
@@ -160,7 +160,7 @@
 }
 
 #history-filter-type {
-    width: 127px;
+    width: 96px;
     height: 18px;
     line-height: 18px;
     float: left;
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index 85e52b0bc0..656755eb0e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -99,10 +99,10 @@ nf.BulletinBoard = (function () {
                     text: 'by message',
                     value: 'message'
                 }, {
-                    text: 'by source name',
+                    text: 'by name',
                     value: 'sourceName'
                 }, {
-                    text: 'by source id',
+                    text: 'by id',
                     value: 'sourceId'
                 }, {
                     text: 'by group id',
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
index 14c97cfa0e..1938d85cf1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
@@ -69,11 +69,13 @@ nf.HistoryTable = (function () {
         // filter type
         $('#history-filter-type').combo({
             options: [{
-                    text: 'by source id',
-                    value: 'by source id'
+                    text: 'by id',
+                    value: 'by id',
+                    description: 'Filters based on the id of the component that was modified'
                 }, {
                     text: 'by user',
-                    value: 'by user'
+                    value: 'by user',
+                    description: 'Filters based on the user that performed the action'
                 }]
         });
 
@@ -106,7 +108,7 @@ nf.HistoryTable = (function () {
                             var filterText = $('#history-filter').val();
                             if (filterText !== '') {
                                 var filterType = $('#history-filter-type').combo('getSelectedOption').text;
-                                if (filterType === 'by source id') {
+                                if (filterType === 'by id') {
                                     filter['sourceId'] = filterText;
                                 } else if (filterType === 'by user') {
                                     filter['userName'] = filterText;
@@ -228,6 +230,9 @@ nf.HistoryTable = (function () {
 
         // clear the current filter
         $('#clear-history-filter').click(function () {
+            // clear the filter dialog
+            $('#history-filter').val('');
+            
             // hide the overview
             $('#history-filter-overview').hide();