diff --git a/frontend/src/Datasets.vue b/frontend/src/Datasets.vue
index 04a2b49a..675482f7 100644
--- a/frontend/src/Datasets.vue
+++ b/frontend/src/Datasets.vue
@@ -46,7 +46,7 @@
   <script lang="ts">
   import { inject } from 'vue'
   
-  import { get, reportError, chatNoirUrl, irDatasetsUrls, type UserInfo, type DatasetInfo } from './utils';
+  import { get_from_archive, reportError, chatNoirUrl, irDatasetsUrls, type UserInfo, type DatasetInfo } from './utils';
   import { Loading, TiraBreadcrumb } from './components'
   
   export default {
@@ -84,7 +84,7 @@
     },
     beforeMount() {
       this.query = this.$route.query.query as string|undefined
-      get(inject("Archived base URL") + '/v1/datasets/all', false)
+      get_from_archive('/v1/datasets/all')
         .then(
             (result) => { this.$data.datasets = result.filter((i: DatasetInfo) => i.id && i.id.length > 2)}
         )
diff --git a/frontend/src/Systems.vue b/frontend/src/Systems.vue
index 9a4f4f1f..e04a52a2 100644
--- a/frontend/src/Systems.vue
+++ b/frontend/src/Systems.vue
@@ -38,7 +38,7 @@
 <script lang="ts">
   import { inject } from 'vue'
   
-  import { get, reportError, type UserInfo, type SystemInfo } from './utils';
+  import { get_from_archive, reportError, type UserInfo, type SystemInfo } from './utils';
   import { Loading, TiraBreadcrumb } from './components'
   
   export default {
@@ -69,7 +69,7 @@
         this.team = this.$route.params.team as undefined | string
       }
 
-      get(inject("Archived base URL") + '/v1/systems/all', false)
+      get_from_archive('/v1/systems/all')
         .then(
             (result) => { 
               if (this.team) {
diff --git a/frontend/src/TaskOverview.vue b/frontend/src/TaskOverview.vue
index 7ab2cd50..47fe2a73 100644
--- a/frontend/src/TaskOverview.vue
+++ b/frontend/src/TaskOverview.vue
@@ -83,7 +83,7 @@
       <v-autocomplete label="Dataset" :items="datasets" item-title="display_name" item-value="dataset_id"
         v-model="selectedDataset" variant="underlined" clearable />
 
-      <run-list v-if="selectedDataset" :task_id="task_id" :organizer="task.organizer" :organizer_id="task.organizer_id"
+      <run-list v-if="selectedDataset" :task_id="task_id" :from_archive="from_archive" :organizer="task.organizer" :organizer_id="task.organizer_id"
         :dataset_id="selectedDataset" />
     </v-container>
   </div>
@@ -95,7 +95,7 @@ import { inject } from 'vue'
 import { TiraBreadcrumb, TiraTaskAdmin, RunList, Loading, SubmitButton, TaskDocumentation } from './components'
 import RunUpload from "@/RunUpload.vue";
 import { VAutocomplete } from 'vuetify/components'
-import { extractTaskFromCurrentUrl, get_link_to_organizer, get_contact_link_to_organizer, extractDatasetFromCurrentUrl, changeCurrentUrlToDataset, get, inject_response, reportError, fetchUserInfo, type UserInfo, DatasetInfo } from './utils'
+import { extractTaskFromCurrentUrl, get_link_to_organizer, get_contact_link_to_organizer, extractDatasetFromCurrentUrl, changeCurrentUrlToDataset, get_from_archive, inject_response, reportError, type UserInfo, DatasetInfo, TaskInfo } from './utils'
 export default {
   name: "task-list",
   components: { TiraBreadcrumb, RunList, Loading, VAutocomplete, SubmitButton, TiraTaskAdmin, TaskDocumentation, RunUpload },
@@ -115,9 +115,7 @@ export default {
       user_vms_for_task: [],
       datasets: [{ 'dataset_id': 'loading...', 'id': 'loading...', 'display_name': 'loading...', 'default_task': undefined }] as DatasetInfo[],
       tab: "test",
-      archive_url: inject("Archived base URL"),
-      production_url: inject("REST base URL"),
-      url: inject("Archived base URL"),
+      from_archive: true
     }
   },
   computed: {
@@ -160,14 +158,15 @@ export default {
     }
   },
   beforeMount() {
-    get(this.archive_url + '/api/task-list').then(task_list => {
+    get_from_archive('/api/task-list').then(task_list => {
+      let task_to_show: undefined|TaskInfo = undefined
       for (let task of task_list['context']['task_list']) {
-        if (task && task['featured'] && task['task_id'] && this.task_id == task['task_id']) {
-          this.url = this.production_url
+        if (task && task['task_id'] && this.task_id == task['task_id']) {
+          this.from_archive = !task['featured']
         }
       }
 
-      get(this.url + '/api/task/' + this.task_id)
+      get_from_archive('/api/task/' + this.task_id, this.from_archive)
         .then(inject_response(this, { 'loading': false }, true))
         .then(this.updateDataset)
         .catch(reportError("Problem While Loading the Details of the Task " + this.task_id, "This might be a short-term hiccup, please try again. We got the following error: "))
diff --git a/frontend/src/Tasks.vue b/frontend/src/Tasks.vue
index fef46389..f559c7f7 100644
--- a/frontend/src/Tasks.vue
+++ b/frontend/src/Tasks.vue
@@ -53,7 +53,7 @@
 <script lang="ts">
 import { inject } from 'vue'
 
-import { get, reportError, inject_response, type UserInfo, ServerInfo } from './utils';
+import { get_from_archive, reportError, inject_response, type UserInfo, ServerInfo } from './utils';
 import { TiraBreadcrumb, EditTask } from './components'
 
 interface Task {
@@ -121,7 +121,7 @@ export default {
     },
   },
   beforeMount() {
-    get(inject("Archived base URL") + '/api/task-list', false)
+    get_from_archive('/api/task-list')
       .then(inject_response(this))
       .catch(reportError("Problem While Loading the Overview of the Tasks.", "This might be a short-term hiccup, please try again. We got the following error: "))
   }
diff --git a/frontend/src/components/RunList.vue b/frontend/src/components/RunList.vue
index 49ad23ef..b439ee41 100644
--- a/frontend/src/components/RunList.vue
+++ b/frontend/src/components/RunList.vue
@@ -72,13 +72,13 @@ import RunActions from './RunActions.vue'
 import SoftwareDetails from './SoftwareDetails.vue'
 import Loading from "./Loading.vue"
 import SubmissionIcon from "./SubmissionIcon.vue"
-import { get, reportError, inject_response, fetchUserInfo, type UserInfo } from '../utils'
+import { get_from_archive, reportError, inject_response, type UserInfo } from '../utils'
 
 
 export default {
   name: "run-list",
   components: { RunActions, SoftwareDetails, Loading, SubmissionIcon },
-  props: ['task_id', 'dataset_id', 'organizer', 'organizer_id', 'vm_id', 'docker_software_id', 'upload_id', 'show_only_unreviewed'],
+  props: ['task_id', 'dataset_id', 'organizer', 'organizer_id', 'vm_id', 'docker_software_id', 'upload_id', 'show_only_unreviewed', 'from_archive'],
   data() {
     return {
       userinfo: inject('userinfo') as UserInfo,
@@ -87,8 +87,7 @@ export default {
       runs: [{ 'run_id': 'loading...', 'review_state': 'no-review', 'vm_id': '1', 'link_to_team': 'link', 'dataset_id': '1' }],
       table_headers: [],
       table_headers_small_layout: [],
-      table_sort_by: [],
-      rest_url: inject("REST base URL")
+      table_sort_by: []
     }
   },
   computed: {
@@ -116,13 +115,13 @@ export default {
       this.loading = true
       var rest_endpoint = ''
       if (this.task_id && this.dataset_id) {
-        rest_endpoint = this.rest_url + '/api/evaluations/' + this.task_id + '/' + this.dataset_id
+        rest_endpoint = '/api/evaluations/' + this.task_id + '/' + this.dataset_id
 
         if (this.show_only_unreviewed) {
           rest_endpoint += '?show_only_unreviewed=true'
         }
       } else if (this.task_id && this.vm_id) {
-        rest_endpoint = this.rest_url + '/api/evaluations-of-vm/' + this.task_id + '/' + this.vm_id
+        rest_endpoint = '/api/evaluations-of-vm/' + this.task_id + '/' + this.vm_id
 
         if (this.docker_software_id) {
           rest_endpoint += '?docker_software_id=' + this.docker_software_id
@@ -131,7 +130,7 @@ export default {
         }
       }
 
-      get(rest_endpoint)
+      get_from_archive(rest_endpoint, this.from_archive)
         .then(inject_response(this, { 'loading': false }))
         .catch(reportError("Problem While Loading the List of Runs", "This might be a short-term hiccup, please try again. We got the following error: "))
     },
diff --git a/frontend/src/utils.ts b/frontend/src/utils.ts
index 8fe71af0..ecbd99f7 100644
--- a/frontend/src/utils.ts
+++ b/frontend/src/utils.ts
@@ -2,6 +2,8 @@ import { inject, ref } from 'vue'
 
 export interface TaskInfo {
     task_name: string;
+    featured: boolean | undefined;
+
 }
 
 export interface DatasetInfo {
@@ -44,7 +46,6 @@ export interface SystemInfo {
     tasks: string;
 }
 
-
 export interface ServerInfo {
     version: string;
     restApiVersion: string;
@@ -421,6 +422,26 @@ export function inject_response(obj: any, default_values: any = {}, debug = fals
     }
 }
 
+
+let ARCHIVE_URL: undefined | string = undefined
+let PRODUCTION_URL: undefined | string = undefined
+let USER_INFO: undefined | UserInfo = undefined
+
+export async function get_from_archive(url: string, from_archive: boolean = true) {
+    if (!ARCHIVE_URL || !PRODUCTION_URL || !USER_INFO) {
+        ARCHIVE_URL = inject("Archived base URL")
+        PRODUCTION_URL = inject("REST base URL")
+        USER_INFO = inject('userinfo') as UserInfo
+    }
+
+    let use_prod = USER_INFO.role === 'admin' || USER_INFO.organizer_teams.length > 0 || !from_archive
+
+    console.log('use-prod (' + use_prod + '): ' + url)
+    url = (use_prod ? PRODUCTION_URL : ARCHIVE_URL) + url
+    return get(url, use_prod)
+}
+
+
 /* TODO: credentials=true can be called the legacy behavior when frontend and backend were on the same URL. This should maybe be limited more */
 export async function get(url: string, credentials = true) {
     const response = await fetch(url, { credentials: credentials ? 'include' : 'omit' })