Improve some _VALID_URLs