Url to bookmark refactor