diff --git a/src/components/fetchhelper.js b/src/components/fetchhelper.js
index 8bbee347f1..3bc24a8918 100644
--- a/src/components/fetchhelper.js
+++ b/src/components/fetchhelper.js
@@ -77,6 +77,7 @@
 
     function paramsToString(params) {
         return Object.keys(params)
+            .filter((k) => !!params[k])
             .map(k => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
             .join('&');
     }
@@ -95,7 +96,7 @@
             if (response.status < 400) {
                 if (request.dataType === 'json' || request.headers.accept === 'application/json') {
                     return response.json();
-                } else if (request.dataType === 'text' || (response.headers.get('Content-Type') || '').toLowerCase().includes('text/')) {
+                } else if (request.dataType === 'text' || (response.headers.get('Content-Type') || '').toLowerCase().startsWith('text/')) {
                     return response.text();
                 } else {
                     return response;
diff --git a/src/components/filterdialog/filterdialog.js b/src/components/filterdialog/filterdialog.js
index 7151d21d5e..041fa82e76 100644
--- a/src/components/filterdialog/filterdialog.js
+++ b/src/components/filterdialog/filterdialog.js
@@ -342,8 +342,8 @@ import 'css!./style.css';
                 query.HasSubtitles = chkSubtitle.checked ? true : null;
                 triggerChange(this);
             });
-            context.addEventListener('change', () => {
-                const chkGenreFilter = dom.parentWithClass(context, 'chkGenreFilter');
+            context.addEventListener('change', (e) => {
+                const chkGenreFilter = dom.parentWithClass(e.target, 'chkGenreFilter');
                 if (chkGenreFilter) {
                     const filterName = chkGenreFilter.getAttribute('data-filter');
                     let filters = query.Genres || '';
@@ -357,7 +357,7 @@ import 'css!./style.css';
                     triggerChange(this);
                     return;
                 }
-                const chkTagFilter = dom.parentWithClass(context, 'chkTagFilter');
+                const chkTagFilter = dom.parentWithClass(e.target, 'chkTagFilter');
                 if (chkTagFilter) {
                     const filterName = chkTagFilter.getAttribute('data-filter');
                     let filters = query.Tags || '';
@@ -371,7 +371,7 @@ import 'css!./style.css';
                     triggerChange(this);
                     return;
                 }
-                const chkYearFilter = dom.parentWithClass(context, 'chkYearFilter');
+                const chkYearFilter = dom.parentWithClass(e.target, 'chkYearFilter');
                 if (chkYearFilter) {
                     const filterName = chkYearFilter.getAttribute('data-filter');
                     let filters = query.Years || '';
@@ -385,7 +385,7 @@ import 'css!./style.css';
                     triggerChange(this);
                     return;
                 }
-                const chkOfficialRatingFilter = dom.parentWithClass(context, 'chkOfficialRatingFilter');
+                const chkOfficialRatingFilter = dom.parentWithClass(e.target, 'chkOfficialRatingFilter');
                 if (chkOfficialRatingFilter) {
                     const filterName = chkOfficialRatingFilter.getAttribute('data-filter');
                     let filters = query.OfficialRatings || '';
diff --git a/src/plugins/backdropScreensaver/plugin.js b/src/plugins/backdropScreensaver/plugin.js
index 3e432c0578..acaefa76d2 100644
--- a/src/plugins/backdropScreensaver/plugin.js
+++ b/src/plugins/backdropScreensaver/plugin.js
@@ -22,7 +22,7 @@ class BackdropScreensaver {
             };
 
             const apiClient = connectionManager.currentApiClient();
-            apiClient.getItems(apiClient.getCurrentUserId(), query).then(function (result) {
+            apiClient.getItems(apiClient.getCurrentUserId(), query).then((result) => {
 
                 if (result.Items.length) {