diff --git a/.changeset/real-elephants-shop.md b/.changeset/real-elephants-shop.md
new file mode 100644
index 00000000..25ccace2
--- /dev/null
+++ b/.changeset/real-elephants-shop.md
@@ -0,0 +1,5 @@
+---
+"deezer-sdk": minor
+---
+
+Fix caching to allow search pagination to work properly
diff --git a/.changeset/sixty-jobs-warn.md b/.changeset/sixty-jobs-warn.md
new file mode 100644
index 00000000..7acd228f
--- /dev/null
+++ b/.changeset/sixty-jobs-warn.md
@@ -0,0 +1,5 @@
+---
+"deemix-webui": patch
+---
+
+Minor fixes to ensure search views load as expected
diff --git a/webui/src/client/views/SearchView.vue b/webui/src/client/views/SearchView.vue
index de348233..3028742f 100644
--- a/webui/src/client/views/SearchView.vue
+++ b/webui/src/client/views/SearchView.vue
@@ -173,6 +173,11 @@ function handleMainSearch(newValue) {
 	state.results.allTab.ARTIST.hasLoaded = true;
 	state.results.allTab.PLAYLIST.hasLoaded = true;
 
+	state.results.trackTab = newValue.TRACK;
+	state.results.albumTab = newValue.ALBUM;
+	state.results.artistTab = newValue.ARTIST;
+	state.results.playlistTab = newValue.PLAYLIST;
+
 	if (lastTab.value && lastTab.value.searchType !== "all") {
 		state.currentTab = lastTab.value;
 
diff --git a/webui/src/client/views/TracklistView.vue b/webui/src/client/views/TracklistView.vue
index 9c546159..c8991170 100644
--- a/webui/src/client/views/TracklistView.vue
+++ b/webui/src/client/views/TracklistView.vue
@@ -62,7 +62,7 @@ function showAlbum(data) {
 		artist: { name: artistName },
 		tracks: albumTracks,
 		nb_tracks: numberOfTracks,
-		release_date,
+		release_date: albumReleaseDate,
 		cover_xl,
 	} = data;
 
@@ -75,7 +75,7 @@ function showAlbum(data) {
 		"globals.listTabs.trackN",
 		numberOfTracks
 	)}`;
-	release_date.value = release_date.substring(0, 10);
+	release_date.value = albumReleaseDate.substring(0, 10);
 	image.value = cover_xl;
 
 	if (isEmpty(albumTracks)) {