diff --git a/public/index.html b/public/index.html
index 0130219..f1cffb4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -90,12 +90,12 @@
 					</div>
 					<div class="separator">Search</div>
 					<div class="option checkbox">
-						<label for="st-streamable">Include streamable tracks in searches (experimental)</label>
+						<label for="st-streamable">Include streamable tracks in searches</label>
 						<input type="checkbox" id="st-streamable" name="streamable">
 					</div>
-					<div class="separator">LastFM</div>
+					<div class="separator">Last.fm</div>
 					<div class="option url" id="lfm-connect">
-						<a href="/api/lastfm/connect">Connect your LastFM account</a>
+						<a href="/api/lastfm/connect">Connect your Last.fm account</a>
 					</div>
 					<div class="option url" id="lfm-disconnect">
 						<label id="lfm-connected"></label>
diff --git a/public/index.js b/public/index.js
index f4c0e0d..021eb4b 100644
--- a/public/index.js
+++ b/public/index.js
@@ -497,7 +497,8 @@
       clear.style.display = 'none'
     }
 
-    if (page > pages) page = pages
+    if (page > pages) page = pageNum = pages
+    if (page < pages) page = pageNum = 1
     updatePaging()
 
     if (playlist === -1) {
@@ -796,7 +797,7 @@
     httpGet('/user/info').then(function (data) {
       user = data
       loggedin.innerHTML = 'Logged in as ' + data.username
-      // LastFM
+      // Last.fm
       httpGet('/api/lastfm').then(function (data) {
         user.lastfm = data
         updateLastFMOptions()