Add underscore and dash as valid chars in input names