HtmlPage -> HtmlUrl refactoring