1) We weren't showing previous page links for albums when we should have 2) We needed to wrap the results of url::merge() in url::site() so that we generate server-relative urls.