diff --git a/ts/graphs/GraphsPage.svelte b/ts/graphs/GraphsPage.svelte
index c0f76cf02..c76236bb1 100644
--- a/ts/graphs/GraphsPage.svelte
+++ b/ts/graphs/GraphsPage.svelte
@@ -11,8 +11,8 @@
     export let nightMode: boolean;
     export let graphs: SvelteComponent[];
 
-    export let search: string;
-    export let days: number;
+    export let initialSearch: string;
+    export let initialDays: number;
     export let controller: SvelteComponent | null;
 
     const browserSearch = (search: string, query: string) => {
@@ -30,20 +30,20 @@
 
 <div class="base">
     <WithGraphData
-        {search}
-        {days}
-        let:search={searchStore}
-        let:days={daysStore}
+        {initialSearch}
+        {initialDays}
+        let:search
+        let:days
         let:pending
         let:loading
         let:sourceData
         let:preferences
         let:revlogRange>
         {#if controller}
-            <svelte:component this={controller} {i18n} search={searchStore} days={daysStore} {loading} />
+            <svelte:component this={controller} {i18n} {search} {days} {loading} />
         {/if}
 
-        {#if !pending && sourceData && preferences}
+        {#if !pending}
             {#each graphs as graph}
                 <svelte:component
                     this={graph}
diff --git a/ts/graphs/RangeBox.svelte b/ts/graphs/RangeBox.svelte
index 86413cfa6..b2449ec45 100644
--- a/ts/graphs/RangeBox.svelte
+++ b/ts/graphs/RangeBox.svelte
@@ -32,12 +32,10 @@
         switch (searchRange as SearchRange) {
             case SearchRange.Deck:
                 displayedSearch = "deck:current";
-                console.log('search', search)
                 search.set(displayedSearch);
                 break;
             case SearchRange.Collection:
                 displayedSearch = "";
-                console.log('search', search)
                 search.set(displayedSearch);
                 break;
         }
diff --git a/ts/graphs/WithGraphData.svelte b/ts/graphs/WithGraphData.svelte
index e5e94d542..e28d59e33 100644
--- a/ts/graphs/WithGraphData.svelte
+++ b/ts/graphs/WithGraphData.svelte
@@ -1,4 +1,5 @@
 <script lang="typescript">
+    import { onMount } from "svelte";
     import { writable } from "svelte/store";
     import useAsync from "./async";
     import useAsyncReactive from "./asyncReactive";
diff --git a/ts/graphs/asyncReactive.ts b/ts/graphs/asyncReactive.ts
index bb91f1fc7..57d7b500f 100644
--- a/ts/graphs/asyncReactive.ts
+++ b/ts/graphs/asyncReactive.ts
@@ -4,8 +4,8 @@ interface AsyncReativeData<T, E> {
     value: Readable<T | null>;
     error: Readable<E | null>;
     pending: Readable<boolean>;
-    success: Readable<boolean>;
     loading: Readable<boolean>;
+    success: Readable<boolean>;
 }
 
 function useAsyncReactive<T, E>(
diff --git a/ts/graphs/index.ts b/ts/graphs/index.ts
index 4e261cfd6..68e877e66 100644
--- a/ts/graphs/index.ts
+++ b/ts/graphs/index.ts
@@ -40,8 +40,8 @@ export function graphs(
                 i18n,
                 graphs,
                 nightMode,
-                search,
-                days,
+                initialSearch: search,
+                initialDays: days,
                 controller,
             },
         });