Add a few more url edge cases