CHANGED \w+ to [\w\-]+ to account for dashes in urls