Url: some improvements [WIP]