diff --git a/routes/index.mjs b/routes/index.mjs
index 6daf8ec..e2e4317 100644
--- a/routes/index.mjs
+++ b/routes/index.mjs
@@ -7,12 +7,14 @@ let router = express.Router();
 /* GET manifest JSON */
 router.get('/iiif/:manifestid/manifest', async function(req, res) {
 	const manifest = await generateManifest(req.params.manifestid)
+	res.set('Access-Control-Allow-Origin', '*');
 	res.json(manifest);
 });
 
 /* GET manifest JSON */
 router.get('/iiif/:manifestid/canvas/:name', async function(req, res) {
 	const canvas = await generateCanvas(req.params.manifestid, req.params.name)
+	res.set('Access-Control-Allow-Origin', '*');
 	res.json(canvas);
 });
 
diff --git a/src/common.js b/src/common.js
index e55526d..2e0b635 100644
--- a/src/common.js
+++ b/src/common.js
@@ -15,7 +15,9 @@ Common.getImageList = async function (manifestId) {
 
 	folderName += '_iiif';
 
-    return await fs.promises.readdir(`${process.env.IMAGES_DIR}/${folderName}`);
+    let baseFolder = folderName.split('_')[0] + '_' + folderName.split('_')[1] + '_iiif';
+
+    return await fs.promises.readdir(`${process.env.IMAGES_DIR}/${baseFolder}/${folderName}`);
 }
 /**
  * @param {string} imageId The image's id as a URL to the image server