diff --git a/src/pages/configurator/input/_applet.astro b/src/pages/configurator/input/_applet.astro
index 6ff5b94..a7964a7 100644
--- a/src/pages/configurator/input/_applet.astro
+++ b/src/pages/configurator/input/_applet.astro
@@ -64,10 +64,10 @@
     );
 
     const promises = Object.entries(groups).map(
-      async ([scheme, cachedTracks]: [string, Track[]]) => {
+      async ([scheme, cachedTracksGroup]: [string, Track[]]) => {
         switch (scheme) {
           case input.nativeFs.manifest.input_properties.scheme:
-            await input.nativeFs.sendAction("list", cachedTracks);
+            await input.nativeFs.sendAction("list", cachedTracksGroup);
             return input.nativeFs.data;
 
           default:
diff --git a/src/pages/input/native-fs/_applet.astro b/src/pages/input/native-fs/_applet.astro
index f56bc98..dcac63a 100644
--- a/src/pages/input/native-fs/_applet.astro
+++ b/src/pages/input/native-fs/_applet.astro
@@ -108,7 +108,11 @@
   };
 
   const list = async (cachedTracks: Track[] = []) => {
-    if (!isSupported()) return cachedTracks;
+    if (!isSupported()) {
+      // TODO
+      context.data = cachedTracks;
+      return cachedTracks;
+    }
 
     // Continue if supported
     const handles = await fetchHandlesList();
@@ -162,7 +166,11 @@
   };
 
   const resolve = async (fileUri: string) => {
-    if (!isSupported()) return undefined;
+    if (!isSupported()) {
+      // TODO
+      context.data = undefined;
+      return undefined;
+    }
 
     const uri = URI.parse(fileUri);
     if (uri.scheme !== SCHEME) return undefined;
diff --git a/src/scripts/themes/webamp/index.ts b/src/scripts/themes/webamp/index.ts
index 3bd3f06..622699a 100644
--- a/src/scripts/themes/webamp/index.ts
+++ b/src/scripts/themes/webamp/index.ts
@@ -37,7 +37,7 @@ amp.renderWhenReady(ampNode);
 ////////////////////////////////////////////
 
 async function makeList() {
-  await configurator.input.sendAction("list");
+  await configurator.input.sendAction("list", []);
   const list = configurator.input.data as Track[];
 
   return list.reduce(async (acc: Promise<Array<{ url: string }>>, track: Track) => {