diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
index 99f6d76f05..e169a82c3a 100644
--- a/src/controllers/itemDetails/index.js
+++ b/src/controllers/itemDetails/index.js
@@ -1257,9 +1257,13 @@ function renderTags(page, item) {
         tags = [];
     }
 
-    for (let i = 0, length = tags.length; i < length; i++) {
-        tagElements.push('<a href="#/search.html?query=' + encodeURIComponent(tags[i]) + '" class="button-link emby-button" is="emby-linkbutton">' + tags[i] + '</a>');
-    }
+    tags.forEach(tag => {
+        tagElements.push(
+            `<a href="#/search.html?query=${encodeURIComponent(tag)}" class="button-link emby-button" is="emby-linkbutton">`
+            + escapeHtml(tag)
+            + '</a>'
+        );
+    });
 
     if (tagElements.length) {
         itemTags.innerHTML = globalize.translate('TagsValue', tagElements.join(', '));
diff --git a/src/elements/emby-input/Input.tsx b/src/elements/emby-input/Input.tsx
index 327976dc79..63cde7084c 100644
--- a/src/elements/emby-input/Input.tsx
+++ b/src/elements/emby-input/Input.tsx
@@ -1,7 +1,7 @@
+import classNames from 'classnames';
 import React, { type DetailedHTMLProps, type InputHTMLAttributes, type FC, useState, useCallback } from 'react';
 
 import './emby-input.scss';
-import classNames from 'classnames';
 
 interface InputProps extends DetailedHTMLProps<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
     id: string,