Update to reflect inclusion of newpct1 domain

- Detect newpct1 url as re-writable.
- Switched to regular expressions to simplify.
- Minor logic changes to save code.