[BUGFIX] Fix URL parsing for ports other than 80 or 443
[BUGFIX] Do use extracted port if available