Fixing regex

Should match all relevant strings. tested via regex101.com and by running against data in r/test