Changed the way url parsing and joining works