added `@` to `validGeneralUrlPathChars` and `validUrlQueryChars`