diff --git a/build/media/com_tags/js/tag-default.js b/build/media/com_tags/js/tag-default.js
deleted file mode 100644
index 980487ef0e7e1..0000000000000
--- a/build/media/com_tags/js/tag-default.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-(function (document) {
-  'use strict';
-
-  // selectors used in this scirpt
-  var formId = 'adminForm';
-  var searchFilterId = 'filter-search';
-
-  document.addEventListener('DOMContentLoaded', function () {
-      var form = document.getElementById(formId);
-      form.querySelector('button[type="reset"]').addEventListener('click', function(event) {
-        document.getElementById(searchFilterId).value = '';
-        form.submit();
-      })
-  });
-})(document);
diff --git a/build/media/com_tags/js/tag-list.js b/build/media/com_tags/js/tag-list.js
deleted file mode 100644
index c1422ff5a3f05..0000000000000
--- a/build/media/com_tags/js/tag-list.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-(function (document) {
-  'use strict';
-
-  // selectors used in this scirpt
-  var formId = 'adminForm';
-  var searchFilterId = 'filter-search';
-
-  document.addEventListener('DOMContentLoaded', function () {
-    var form = document.getElementById(formId);
-    form.querySelector('button[type="reset"]').addEventListener('click', function(event) {
-      document.getElementById(searchFilterId).value = '';
-      form.submit();
-    })
-  });
-})(document);
diff --git a/build/media/com_tags/js/tags-default.js b/build/media/com_tags/js/tags-default.js
deleted file mode 100644
index c1422ff5a3f05..0000000000000
--- a/build/media/com_tags/js/tags-default.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-(function (document) {
-  'use strict';
-
-  // selectors used in this scirpt
-  var formId = 'adminForm';
-  var searchFilterId = 'filter-search';
-
-  document.addEventListener('DOMContentLoaded', function () {
-    var form = document.getElementById(formId);
-    form.querySelector('button[type="reset"]').addEventListener('click', function(event) {
-      document.getElementById(searchFilterId).value = '';
-      form.submit();
-    })
-  });
-})(document);
diff --git a/build/media_src/com_tags/js/tag-default.es6.js b/build/media_src/com_tags/js/tag-default.es6.js
new file mode 100644
index 0000000000000..0ef1b39bd0781
--- /dev/null
+++ b/build/media_src/com_tags/js/tag-default.es6.js
@@ -0,0 +1,26 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+((document) => {
+  'use strict';
+
+  const onClick = () => {
+    const form = document.getElementById('adminForm');
+    document.getElementById('filter-search').value = '';
+    form.submit();
+  };
+
+  const onBoot = () => {
+    const form = document.getElementById('adminForm');
+    const element = form.querySelector('button[type="reset"]');
+
+    if (element) {
+      element.addEventListener('click', onClick);
+    }
+
+    document.removeEventListener('DOMContentLoaded', onBoot);
+  };
+
+  document.addEventListener('DOMContentLoaded', onBoot);
+})(document);
diff --git a/build/media_src/com_tags/js/tag-list.es6.js b/build/media_src/com_tags/js/tag-list.es6.js
new file mode 100644
index 0000000000000..72dfbbf37401d
--- /dev/null
+++ b/build/media_src/com_tags/js/tag-list.es6.js
@@ -0,0 +1,27 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+((document) => {
+  'use strict';
+
+  const onClick = () => {
+    const form = document.getElementById('adminForm');
+    document.getElementById('filter-search').value = '';
+    form.submit();
+  };
+
+  const onBoot = () => {
+    const form = document.getElementById('adminForm');
+    const element = form.querySelector('button[type="reset"]');
+
+    if (element) {
+      element.addEventListener('click', onClick);
+    }
+
+    document.removeEventListener('DOMContentLoaded', onBoot);
+  };
+
+  document.addEventListener('DOMContentLoaded', onBoot);
+})(document);
+
diff --git a/build/media_src/com_tags/js/tags-default.es6.js b/build/media_src/com_tags/js/tags-default.es6.js
new file mode 100644
index 0000000000000..0ef1b39bd0781
--- /dev/null
+++ b/build/media_src/com_tags/js/tags-default.es6.js
@@ -0,0 +1,26 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+((document) => {
+  'use strict';
+
+  const onClick = () => {
+    const form = document.getElementById('adminForm');
+    document.getElementById('filter-search').value = '';
+    form.submit();
+  };
+
+  const onBoot = () => {
+    const form = document.getElementById('adminForm');
+    const element = form.querySelector('button[type="reset"]');
+
+    if (element) {
+      element.addEventListener('click', onClick);
+    }
+
+    document.removeEventListener('DOMContentLoaded', onBoot);
+  };
+
+  document.addEventListener('DOMContentLoaded', onBoot);
+})(document);