Add support for URLs with hyphens and underscores in them