diff --git a/.env.template b/.env.template
index 92039b1..53cce9a 100644
--- a/.env.template
+++ b/.env.template
@@ -1 +1,2 @@
 OWLREPO_URL=https://owlrepo-nonprod.wl.r.appspot.com
+PROJECT_ID=owlrepo-nonprod
diff --git a/app.nonprod.yaml b/app.nonprod.yaml
index b56bcb9..408ee48 100644
--- a/app.nonprod.yaml
+++ b/app.nonprod.yaml
@@ -2,4 +2,5 @@ runtime: nodejs14
 entrypoint: node __sapper__/build
 
 env_variables:
+  PROJECT_ID: owlrepo-nonprod
   OWLREPO_URL: https://api-v1-3s5yebp5cq-uc.a.run.app
diff --git a/app.prod.yaml b/app.prod.yaml
index 7e8709d..044cd08 100644
--- a/app.prod.yaml
+++ b/app.prod.yaml
@@ -2,4 +2,5 @@ runtime: nodejs14
 entrypoint: node __sapper__/build
 
 env_variables:
+  PROJECT_ID: owlrepo
   OWLREPO_URL: https://api-v1-6jpxgj6jpa-uc.a.run.app
diff --git a/src/routes/api/v2/data/[task_id]/[prefix].js b/src/routes/api/v2/data/[task_id]/[prefix].js
new file mode 100644
index 0000000..ad01482
--- /dev/null
+++ b/src/routes/api/v2/data/[task_id]/[prefix].js
@@ -0,0 +1,8 @@
+const BUCKET = process.env.PROJECT_ID;
+
+export async function get(req, res, next) {
+  const { task_id, prefix } = req.params;
+  res.redirect(
+    `https://storage.googleapis.com/${BUCKET}/v1/uploads/${task_id}/${prefix}`
+  );
+}
diff --git a/src/routes/api/v2/query/[prefix].js b/src/routes/api/v2/query/[prefix].js
new file mode 100644
index 0000000..ee6dce2
--- /dev/null
+++ b/src/routes/api/v2/query/[prefix].js
@@ -0,0 +1,8 @@
+const BUCKET = process.env.PROJECT_ID;
+
+export async function get(req, res, next) {
+  const { prefix } = req.params;
+  res.redirect(
+    `https://storage.googleapis.com/${BUCKET}/v1/queries/${prefix}.json`
+  );
+}
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 95d6595..ab6b897 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -1,3 +1,16 @@
+<script context="module">
+  export async function preload() {
+    const fetchData = async (url) => {
+      let resp = await this.fetch(url);
+      return await resp.json();
+    };
+    const random_listing = await fetchData("/api/v2/query/random_listing");
+    const heatmap = await fetchData("/api/v2/query/heatmap");
+
+    return { random_listing, heatmap };
+  }
+</script>
+
 <script>
   import IndexView from "../components/IndexView.svelte";
   import ActivityHeatmap from "../components/ActivityHeatmap.svelte";
@@ -7,23 +20,13 @@
   import IndexDescription from "../docs/IndexDescription.svx";
   import References from "../docs/References.svx";
   import CollapseInfo from "../components/CollapseInfo.svelte";
-  import { onMount } from "svelte";
 
   const BG_RED = "#ffaebf";
   const BG_ORANGE = "#ffc6ae";
   const BG_YELLOW = "#ffefae";
-  let random_listing;
-  let heatmap;
-
-  async function fetchData(url) {
-    let resp = await fetch(url);
-    return await resp.json();
-  }
 
-  onMount(async () => {
-    random_listing = await fetchData("/api/v1/query/random_listing");
-    heatmap = await fetchData("/api/v1/query/heatmap");
-  });
+  export let random_listing;
+  export let heatmap;
 </script>
 
 <svelte:head>
@@ -44,12 +47,10 @@
   to see more plots this this.
 </p>
 
-{#if random_listing}
-  <PriceQuantityCharts
-    data={random_listing}
-    search_item_name={random_listing[0].search_item}
-  />
-{/if}
+<PriceQuantityCharts
+  data={random_listing}
+  search_item_name={random_listing[0].search_item}
+/>
 
 <h2>Contributions</h2>
 <p>
@@ -70,9 +71,7 @@
 </p>
 
 <h3>Upload Activity</h3>
-{#if heatmap}
-  <ActivityHeatmap data={heatmap} max_range={14} />
-{/if}
+<ActivityHeatmap data={heatmap} max_range={14} />
 
 <br />
 
diff --git a/src/server.js b/src/server.js
index 844cdaf..8b2e008 100644
--- a/src/server.js
+++ b/src/server.js
@@ -17,6 +17,21 @@ server.use(
   })
 );
 
+// simple redirect middleware
+// https://github.com/lukeed/polka/issues/78#issuecomment-600496930
+server.use(function (req, res, next) {
+  res.redirect = (location) => {
+    let str = `Redirecting to ${location}`;
+    res.writeHead(302, {
+      Location: location,
+      "Content-Type": "text/plain",
+      "Content-Length": str.length,
+    });
+    res.end(str);
+  };
+  next();
+});
+
 server
   .use(
     compression({ threshold: 0 }),