Modify regexes to handle non ascii form names. Issue: #466