Fixed url parsing