diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 06c22a6dc..3615cf373 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -52,6 +52,12 @@ $scrubberHeight: 120px;
   padding-right: 15px;
 }
 
+@media (max-width: 1199px) {
+  .scene-tabs {
+    padding-right: 15px;
+  }
+}
+
 $sceneTabWidth: 450px;
 
 @media (min-width: 1200px) {
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
index 4b7968618..e4982c144 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
@@ -145,7 +145,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
             <div className="col-6 col-xl-12">
               <Field name="primaryTagId">{renderPrimaryTagField}</Field>
             </div>
-            <Form.Label htmlFor="seconds" className="col-1 col-xl-12">
+            <Form.Label htmlFor="seconds" className="col-1 col-xl-12 mt-2">
               Time
             </Form.Label>
             <Field name="seconds">{renderSecondsField}</Field>
@@ -160,7 +160,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
           </Form.Group>
         </div>
         <div className="buttons-container row">
-          <div className="col">
+          <div className="col d-flex">
             <Button variant="primary" type="submit">
               Submit
             </Button>
diff --git a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
index 6d4f29d0e..b1c72d53f 100644
--- a/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
@@ -271,11 +271,15 @@ export const SettingsTasksPanel: React.FC = () => {
       return;
     }
 
+    const taskPlugins = plugins.data.plugins.filter(
+      (p) => p.tasks && p.tasks.length > 0
+    );
+
     return (
       <>
         <hr />
         <h5>{intl.formatMessage({ id: "config.tasks.plugin_tasks" })}</h5>
-        {plugins.data.plugins.map((o) => {
+        {taskPlugins.map((o) => {
           return (
             <div key={`${o.id}`} className="mb-3">
               <h6>{o.name}</h6>
diff --git a/ui/v2.5/src/hooks/ListHook.tsx b/ui/v2.5/src/hooks/ListHook.tsx
index 99a46b90e..d7126721b 100644
--- a/ui/v2.5/src/hooks/ListHook.tsx
+++ b/ui/v2.5/src/hooks/ListHook.tsx
@@ -620,11 +620,21 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
 
     if (!forageInitialised) setForageInitialised(true);
 
-    if (!options.persistState) return;
-
     const newFilter = filter.clone();
     let update = false;
 
+    // Compare constructed filter with current filter.
+    // If different it's the result of navigation, and we update the filter.
+    if (
+      location.search &&
+      location.search !== `?${filter.makeQueryParameters()}`
+    ) {
+      newFilter.configureFromQueryParameters(
+        queryString.parse(location.search)
+      );
+      update = true;
+    }
+
     // if default query is set and no search params are set, then
     // load the default query
     // #1512 - use default query only if persistState is ALL