Switch to strlenutf8
Use a better matching pattern