Adding underscore to non-word characters