Improve url parsing on the extension side
Merge pull request #827 from yurydelendik/candown

Improves url parsing on the extension side