Fix URL validation and add a few more characters to valid URLs