Add ability for URLs with underscores to also work