Update regexes to match more topic cases.