Changed handling of page links.