Fixed issue regarding URL parsing