Url parsing updated