diff --git a/pyzebra/app/panel_ccl_integrate.py b/pyzebra/app/panel_ccl_integrate.py
index 00cc636..d7f0e7a 100644
--- a/pyzebra/app/panel_ccl_integrate.py
+++ b/pyzebra/app/panel_ccl_integrate.py
@@ -62,8 +62,6 @@ for (let i = 0; i < js_data.data['fname'].length; i++) {
 }
 """
 
-PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
-
 
 def create():
     det_data = {}
@@ -71,11 +69,13 @@ def create():
     js_data = ColumnDataSource(data=dict(content=["", ""], fname=["", ""]))
 
     def proposal_textinput_callback(_attr, _old, new):
-        ccl_path = os.path.join(PROPOSAL_PATH, new.strip())
+        proposal = new.strip()
+        year = new[:4]
+        proposal_path = f"/afs/psi.ch/project/sinqdata/{year}/zebra/{proposal}"
         ccl_file_list = []
-        for file in os.listdir(ccl_path):
+        for file in os.listdir(proposal_path):
             if file.endswith((".ccl", ".dat")):
-                ccl_file_list.append((os.path.join(ccl_path, file), file))
+                ccl_file_list.append((os.path.join(proposal_path, file), file))
         file_select.options = ccl_file_list
 
     proposal_textinput = TextInput(title="Proposal number:", width=210)
diff --git a/pyzebra/app/panel_hdf_viewer.py b/pyzebra/app/panel_hdf_viewer.py
index 97ec5dc..df90884 100644
--- a/pyzebra/app/panel_hdf_viewer.py
+++ b/pyzebra/app/panel_hdf_viewer.py
@@ -43,19 +43,19 @@ IMAGE_H = 128
 IMAGE_PLOT_W = int(IMAGE_W * 2.5)
 IMAGE_PLOT_H = int(IMAGE_H * 2.5)
 
-PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
-
 
 def create():
     det_data = {}
     roi_selection = {}
 
     def proposal_textinput_callback(_attr, _old, new):
-        full_proposal_path = os.path.join(PROPOSAL_PATH, new.strip())
+        proposal = new.strip()
+        year = new[:4]
+        proposal_path = f"/afs/psi.ch/project/sinqdata/{year}/zebra/{proposal}"
         file_list = []
-        for file in os.listdir(full_proposal_path):
+        for file in os.listdir(proposal_path):
             if file.endswith(".hdf"):
-                file_list.append((os.path.join(full_proposal_path, file), file))
+                file_list.append((os.path.join(proposal_path, file), file))
         filelist.options = file_list
         filelist.value = file_list[0][0]
 
diff --git a/pyzebra/app/panel_param_study.py b/pyzebra/app/panel_param_study.py
index 8329c87..79966b0 100644
--- a/pyzebra/app/panel_param_study.py
+++ b/pyzebra/app/panel_param_study.py
@@ -66,8 +66,6 @@ for (let i = 0; i < js_data.data['fname'].length; i++) {
 }
 """
 
-PROPOSAL_PATH = "/afs/psi.ch/project/sinqdata/2020/zebra/"
-
 
 def color_palette(n_colors):
     palette = itertools.cycle(Category10[10])
@@ -80,11 +78,13 @@ def create():
     js_data = ColumnDataSource(data=dict(content=["", ""], fname=["", ""]))
 
     def proposal_textinput_callback(_attr, _old, new):
-        full_proposal_path = os.path.join(PROPOSAL_PATH, new.strip())
+        proposal = new.strip()
+        year = new[:4]
+        proposal_path = f"/afs/psi.ch/project/sinqdata/{year}/zebra/{proposal}"
         dat_file_list = []
-        for file in os.listdir(full_proposal_path):
+        for file in os.listdir(proposal_path):
             if file.endswith(".dat"):
-                dat_file_list.append((os.path.join(full_proposal_path, file), file))
+                dat_file_list.append((os.path.join(proposal_path, file), file))
         file_select.options = dat_file_list
 
     proposal_textinput = TextInput(title="Proposal number:", width=210)