diff --git a/templates/browse.gohtml b/templates/browse.gohtml
index 2fcc5e1..acb4f23 100644
--- a/templates/browse.gohtml
+++ b/templates/browse.gohtml
@@ -1,6 +1,7 @@
 {{define "title"}}Browse{{end}}
+{{define "scripts"}}{{end}}
 {{define "content"}}
-{{if .WatchlistIDs}}<script>window.__WATCHLIST_IDS__={{.WatchlistIDs}}</script>{{end}}
+{{if .WatchlistIDs}}<script type="application/json" id="watchlist-ids-json">{{.WatchlistIDs}}</script>{{end}}
 {{template "browse_content" .}}
 {{end}}
 
@@ -70,7 +71,7 @@
 {{end}}
 
 {{define "browse_sentinel"}}
-  <div hx-get="/browse?q={{.Query}}&type={{.Type}}&status={{.Status}}&order_by={{.OrderBy}}&sort={{.Sort}}&studio={{.Studio}}&sfw={{.SFW}}{{ if .Genres }}&{{genresParams .Genres}}{{ end }}&page={{.NextPage}}"
+  <div hx-get='{{browseURL . (dict "page" .NextPage)}}'
        hx-trigger="intersect once"
        hx-swap="outerHTML"
        hx-target="this"
diff --git a/templates/watch.gohtml b/templates/watch.gohtml
index 4a3dcbb..f910af9 100644
--- a/templates/watch.gohtml
+++ b/templates/watch.gohtml
@@ -1,6 +1,7 @@
 {{define "title"}}Watch {{.Anime.Title}}{{end}}
+{{define "scripts"}}<script type="module" src="/dist/static/player/main.js" defer></script>{{end}}
 {{define "content"}}
-{{if .WatchlistIDs}}<script>window.__WATCHLIST_IDS__={{.WatchlistIDs}}</script>{{end}}
+{{if .WatchlistIDs}}<script type="application/json" id="watchlist-ids-json">{{.WatchlistIDs}}</script>{{end}}
 {{$anime := .Anime}}
 {{$episodes := .Episodes}}
 {{$currentEpID := .CurrentEpID}}
diff --git a/templates/watchlist.gohtml b/templates/watchlist.gohtml
index 75dd511..6ea7e7d 100644
--- a/templates/watchlist.gohtml
+++ b/templates/watchlist.gohtml
@@ -1,6 +1,7 @@
 {{define "title"}}Watchlist{{end}}
+{{define "scripts"}}{{end}}
 {{define "content"}}
-{{if .WatchlistIDs}}<script>window.__WATCHLIST_IDS__={{.WatchlistIDs}}</script>{{end}}
+{{if .WatchlistIDs}}<script type="application/json" id="watchlist-ids-json">{{.WatchlistIDs}}</script>{{end}}
 <div id="watchlist-content" class="flex w-full flex-col gap-6">
   <h1 class="text-xl font-normal tracking-[-0.02em] text-foreground">Watchlist</h1>