Fixed breaking mistakes in regex

Unnecesary extra capture groups. Accidentally removed space after
"from" - replace with 1+ whitespace gobbler