Short code updated to allow underscores