Updating proper pathname
Removing port from url parsing until we get a convincing use case
Merged