Fixes #6637 rework url helper.

Used class uri to parse url