diff --git a/starsky/starsky/clientapp/src/components/atoms/file-hash-image/pan-and-zoom-image.tsx b/starsky/starsky/clientapp/src/components/atoms/file-hash-image/pan-and-zoom-image.tsx
index 2cdb7cc669..5d83092545 100644
--- a/starsky/starsky/clientapp/src/components/atoms/file-hash-image/pan-and-zoom-image.tsx
+++ b/starsky/starsky/clientapp/src/components/atoms/file-hash-image/pan-and-zoom-image.tsx
@@ -161,7 +161,6 @@ const PanAndZoomImage = ({ src, id, ...props }: IPanAndZoomImage) => {
           <img
             className={`pan-zoom-image--image image--default ${props.translateRotation}`}
             alt="image"
-            role="presentation"
             src={src}
             onLoad={
               new OnLoadMouseAction(
diff --git a/starsky/starsky/clientapp/src/components/atoms/form-control/form-control.tsx b/starsky/starsky/clientapp/src/components/atoms/form-control/form-control.tsx
index 04da680e56..7160df3f4a 100644
--- a/starsky/starsky/clientapp/src/components/atoms/form-control/form-control.tsx
+++ b/starsky/starsky/clientapp/src/components/atoms/form-control/form-control.tsx
@@ -62,7 +62,6 @@ const FormControl: React.FunctionComponent<IFormControlProps> = ({
 
       <div
         data-test={props["data-test"] ? props["data-test"] : "form-control"}
-        role="button"
         onBlur={
           new LimitLength(setChildLength, onBlur, maxlength).LimitLengthBlur
         }
diff --git a/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx b/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx
index f644623742..c255beb262 100644
--- a/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx
+++ b/starsky/starsky/clientapp/src/components/atoms/list-image/list-image.tsx
@@ -114,7 +114,6 @@ const ListImage: React.FunctionComponent<IListImageProps> = memo((props) => {
         <img
           src={src}
           alt={alt}
-          role="presentation"
           data-test="list-image-img"
           onLoad={() => {
             setError(false);
diff --git a/starsky/starsky/clientapp/src/components/atoms/modal/modal.tsx b/starsky/starsky/clientapp/src/components/atoms/modal/modal.tsx
index 94f1d60c3a..f296a24cdf 100644
--- a/starsky/starsky/clientapp/src/components/atoms/modal/modal.tsx
+++ b/starsky/starsky/clientapp/src/components/atoms/modal/modal.tsx
@@ -68,7 +68,6 @@ export default function Modal({
     return ReactDOM.createPortal(
       <div
         onClick={(event) => ifModalOpenHandleExit(event, handleExit)}
-        role="presentation"
         onKeyDown={(event) => {
           event.key === "Enter" && handleExit();
         }}
diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx
index 969f404e05..19c0a0e347 100644
--- a/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx
+++ b/starsky/starsky/clientapp/src/components/molecules/menu-inline-search/menu-inline-search.tsx
@@ -102,7 +102,6 @@ const MenuInlineSearch: React.FunctionComponent<IMenuSearchBarProps> = (
       <div
         className={!formFocus ? "blur" : ""}
         onFocus={() => setFormFocus(true)}
-        role="presentation"
       >
         <ul>
           <li className="menu-item menu-item--half-extra">
diff --git a/starsky/starsky/clientapp/src/components/molecules/menu-option-move-to-trash/menu-option-move-to-trash.tsx b/starsky/starsky/clientapp/src/components/molecules/menu-option-move-to-trash/menu-option-move-to-trash.tsx
index 48e1600ad7..a0561da16a 100644
--- a/starsky/starsky/clientapp/src/components/molecules/menu-option-move-to-trash/menu-option-move-to-trash.tsx
+++ b/starsky/starsky/clientapp/src/components/molecules/menu-option-move-to-trash/menu-option-move-to-trash.tsx
@@ -52,6 +52,9 @@ const MenuOptionMoveToTrash: React.FunctionComponent<IMenuOptionMoveToTrashProps
       if (selectParams.length === 0) return;
 
       const bodyParams = new URLSearchParams();
+      // noinspection PointlessBooleanExpressionJS
+      const collections = new URLPath().StringToIUrl(history.location.search).collections !==
+        false;
 
       bodyParams.append("f", selectParams);
       bodyParams.set("Tags", "!delete!");
@@ -59,10 +62,7 @@ const MenuOptionMoveToTrash: React.FunctionComponent<IMenuOptionMoveToTrashProps
       bodyParams.set("Colorclass", "8");
       bodyParams.set(
         "collections",
-        (
-          new URLPath().StringToIUrl(history.location.search).collections !==
-          false
-        ).toString()
+        collections.toString()
       );
 
       const resultDo = await FetchPost(
diff --git a/starsky/starsky/clientapp/src/components/organisms/detail-view-media/detail-view-mp4.tsx b/starsky/starsky/clientapp/src/components/organisms/detail-view-media/detail-view-mp4.tsx
index 081fd1b907..5a95e86dfe 100644
--- a/starsky/starsky/clientapp/src/components/organisms/detail-view-media/detail-view-mp4.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/detail-view-media/detail-view-mp4.tsx
@@ -196,8 +196,8 @@ const DetailViewMp4: React.FunctionComponent = memo(() => {
     );
   }
 
-  function updateProgressByClick(event: React.MouseEvent) {
-    if (!videoRef.current || !event.target) return;
+  function updateProgressByClick(event?: React.MouseEvent) {
+    if (!videoRef.current || !event?.target) return;
     const mousePosition = getMousePosition(event);
 
     const result = isNaN(mousePosition)
@@ -271,9 +271,11 @@ const DetailViewMp4: React.FunctionComponent = memo(() => {
               <progress
                 ref={progressRef}
                 onClick={updateProgressByClick}
-                role="presentation"
                 className="progress"
                 value="0"
+                onKeyDown={(event) => {
+                  event.key === "Enter" && updateProgressByClick();
+                }}
               >
                 <span id="progress-bar"></span>
               </progress>
diff --git a/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.tsx b/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.tsx
index 717c932c00..c5f53c84ce 100644
--- a/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.tsx
+++ b/starsky/starsky/clientapp/src/components/organisms/menu-detail-view/menu-detail-view.tsx
@@ -49,11 +49,7 @@ function GetHeaderClass(
       return "header header--main header--edit";
     }
   } else {
-    if (isMarkedAsDeleted) {
-      return "header header--main header--deleted";
-    } else {
-      return "header header--main";
-    }
+    return isMarkedAsDeleted ? "header header--main header--deleted" : "header header--main";
   }
 }