diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index f740b60..192bd2c 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -1488,7 +1488,8 @@ export const serve_rendered = {
             inputFile = mapsTo;
           }
 
-          const DataInfo = dataResolver(inputFile);
+          let protocol = url.split(':')[0];
+          const DataInfo = dataResolver(inputFile, protocol);
           if (DataInfo.inputfile) {
             inputFile = DataInfo.inputfile;
             source_type = DataInfo.filetype;
diff --git a/src/server.js b/src/server.js
index f896eb5..419f8db 100644
--- a/src/server.js
+++ b/src/server.js
@@ -217,7 +217,7 @@ function start(opts) {
               let id = fileid.substr(0, fileid.lastIndexOf('.')) || fileid;
               while (data[id]) id += '_';
               data[id] = {
-                mbtiles: fileid,
+                filename: fileid,
               };
               return id;
             }
@@ -239,7 +239,8 @@ function start(opts) {
             item,
             id,
             opts.publicUrl,
-            (fileid) => {
+            (fileid, protocol) => {
+              //console.log(protocol);
               let inputFile;
               let fileType;
               for (const id of Object.keys(data)) {
@@ -260,6 +261,12 @@ function start(opts) {
                       data[id].mbtiles,
                     );
                     fileType = 'mbtiles';
+                  } else if (data[id].filename !== undefined) {
+                    inputFile = path.resolve(
+                      options.paths[protocol],
+                      data[id].filename,
+                    );
+                    fileType = protocol;
                   }
                 }
               }