diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index f38f14081..2aa93c919 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -15,6 +15,7 @@ Meteor.startup(() => {
     Session.set('TimepointsReady', false);
     Session.set('MeasurementsReady', false);
 
+    OHIF.viewer.displaySeriesQuickSwitch = true;
     OHIF.viewer.stackImagePositionOffsetSynchronizer = new OHIF.viewerbase.StackImagePositionOffsetSynchronizer();
 
     // Create the synchronizer used to update reference lines
diff --git a/LesionTracker/client/components/viewerSection/viewerSection.js b/LesionTracker/client/components/viewerSection/viewerSection.js
index 92685b1ca..c05114bf6 100644
--- a/LesionTracker/client/components/viewerSection/viewerSection.js
+++ b/LesionTracker/client/components/viewerSection/viewerSection.js
@@ -29,7 +29,6 @@ Template.viewerSection.onCreated(() => {
 Template.viewerSection.events({
     'transitionend .sidebarMenu'(event) {
         if (!event.target.classList.contains('sidebarMenu')) return;
-
         window.ResizeViewportManager.handleResize();
     },
 
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
index e39c96429..a004c3eef 100644
--- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
@@ -49,6 +49,7 @@ Template.timepointBrowserItem.onCreated(() => {
         const text = 'An error has occurred while retrieving studies information';
         OHIF.ui.notifications.danger({ text });
         OHIF.log.error(error);
+        instance.summary.set('Failed');
     });
 
     updateStudiesData();
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
index ba71c4e26..a71c11cd9 100644
--- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
@@ -79,7 +79,8 @@ Template.timepointBrowserSidebar.helpers({
         const { patientId } = currentTimepoint;
         let timepoints = [];
         if (instance.timepointViewType.get() === 'key') {
-            timepoints = timepointApi.key();
+            const filter = { latestDate: { $lte: currentTimepoint.latestDate } };
+            timepoints = timepointApi.key(filter);
         } else {
             timepoints = timepointApi.all({ patientId });
         }
diff --git a/Packages/ohif-servers/both/schema/servers.js b/Packages/ohif-servers/both/schema/servers.js
index 7e76ae12a..62e91701a 100644
--- a/Packages/ohif-servers/both/schema/servers.js
+++ b/Packages/ohif-servers/both/schema/servers.js
@@ -186,11 +186,6 @@ export const UISettings = new SimpleSchema({
         type: Boolean,
         label: 'Define if the middle instance of a series will be used as thumbnail. If not, the first instance will be used.',
         defaultValue: true
-    },
-    displaySeriesQuickSwitch: {
-        type: Boolean,
-        label: 'Define if the studies and series quick switch should be displayed above the viewer viewport',
-        defaultValue: false
     }
 });
 
diff --git a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js
index fa87c3643..8bfaa0d5a 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/seriesQuickSwitch/seriesQuickSwitch.js
@@ -53,7 +53,7 @@ Template.seriesQuickSwitch.helpers({
     shallDisplay() {
         const instance = Template.instance();
         const { rows, columns } = instance.data;
-        return OHIF.uiSettings.displaySeriesQuickSwitch && rows === 1 && columns <= 2;
+        return OHIF.viewer.displaySeriesQuickSwitch && rows === 1 && columns <= 2;
     },
 
     side() {
diff --git a/config/orthancDICOMWeb.json b/config/orthancDICOMWeb.json
index 0a7a6a82f..41a6e733a 100644
--- a/config/orthancDICOMWeb.json
+++ b/config/orthancDICOMWeb.json
@@ -27,8 +27,7 @@
         "leftSidebarOpen": false,
         "displaySetNavigationLoopOverSeries": false,
         "displaySetNavigationMultipleViewports": true,
-        "autoPositionMeasurementsTextCallOuts": "TRLB",
-        "displaySeriesQuickSwitch": true
+        "autoPositionMeasurementsTextCallOuts": "TRLB"
     }
   },
   "proxy": {