Updated Safari URL parser