Fixes #6637 rework url helper.