re #835 - Search for dash and underscore in regex