Fix hyphens highlighting and change url for spaces to underscore