More readable regex for #1694

- also relax domain names