Make page build easier to read
Expand regex and escape dash