Tighten up the regex match to avoid capturing n/a

Tighten up the regex match to avoid capturing n/a #1869