diff --git a/htmlmodules.py b/htmlmodules.py
index 9d95bcd..a7e63e1 100644
--- a/htmlmodules.py
+++ b/htmlmodules.py
@@ -66,7 +66,7 @@ def module_scrobblelist(page=0,perpage=100,max_=None,pictures=False,shortTimeDes
 
 	html += "</table>"
 
-	if max_ is None: html += module_paginate(page=page,pages=pages,**kwargs)
+	if max_ is None: html += module_paginate(page=page,pages=pages,perpage=perpage,**kwargs)
 
 	return (html,len(scrobbles),representative)
 
@@ -109,7 +109,7 @@ def module_pulse(page=0,perpage=100,max_=None,**kwargs):
 		html += "</tr>"
 	html += "</table>"
 
-	if max_ is None: html += module_paginate(page=page,pages=pages,**kwargs)
+	if max_ is None: html += module_paginate(page=page,pages=pages,perpage=perpage,**kwargs)
 
 	return html
 
@@ -153,7 +153,7 @@ def module_performance(page=0,perpage=100,max_=None,**kwargs):
 		html += "</tr>"
 	html += "</table>"
 
-	if max_ is None: html += module_paginate(page=page,pages=pages,**kwargs)
+	if max_ is None: html += module_paginate(page=page,pages=pages,perpage=perpage,**kwargs)
 
 	return html
 
@@ -230,7 +230,7 @@ def module_trackcharts(page=0,perpage=100,max_=None,**kwargs):
 		prev = e
 	html += "</table>"
 
-	if max_ is None: html += module_paginate(page=page,pages=pages,**kwargs)
+	if max_ is None: html += module_paginate(page=page,pages=pages,perpage=perpage,**kwargs)
 
 	return (html,representative)
 
@@ -309,7 +309,7 @@ def module_artistcharts(page=0,perpage=100,max_=None,**kwargs):
 
 	html += "</table>"
 
-	if max_ is None: html += module_paginate(page=page,pages=pages,**kwargs)
+	if max_ is None: html += module_paginate(page=page,pages=pages,perpage=perpage,**kwargs)
 
 	return (html, representative)
 
@@ -528,9 +528,9 @@ def module_trackcharts_tiles(**kwargs):
 
 
 
-def module_paginate(page,pages,**keys):
+def module_paginate(page,pages,perpage,**keys):
 
-	unchangedkeys = internal_to_uri({**keys})
+	unchangedkeys = internal_to_uri({**keys,"perpage":perpage})
 
 	html = "<div class='paginate'>"
 
diff --git a/website/artist.html b/website/artist.html
index 7853411..135281e 100644
--- a/website/artist.html
+++ b/website/artist.html
@@ -16,7 +16,7 @@
 				</td>
 				<td class="text">
 					<h1>KEY_ARTISTNAME</h1>
-						<span class="rank"><a href="/charts_artists?max=100">KEY_POSITION</a></span>
+						<span class="rank"><a href="/charts_artists">KEY_POSITION</a></span>
 						<br/>
 					<span>KEY_ASSOCIATED</span>
 					<p class="stats"><a href="/scrobbles?artist=KEY_ENC_ARTISTNAME">KEY_SCROBBLES Scrobbles</a></p>
diff --git a/website/track.html b/website/track.html
index 4299771..bc99a11 100644
--- a/website/track.html
+++ b/website/track.html
@@ -16,7 +16,7 @@
 				</td>
 				<td class="text">
 					<span>KEY_ARTISTS</span><br/>
-					<h1>KEY_TRACKTITLE</h1> KEY_CERTS <span class="rank"><a href="/charts_tracks?max=100">KEY_POSITION</a></span>
+					<h1>KEY_TRACKTITLE</h1> KEY_CERTS <span class="rank"><a href="/charts_tracks">KEY_POSITION</a></span>
 
 					<p class="stats"><a href="/scrobbles?KEY_SCROBBLELINK">KEY_SCROBBLES Scrobbles</a></p>