Fixed stripping of invalid characters, had underscore as VALID!!